Browse Source

业务代码相关修改

chenjun 4 months ago
parent
commit
6f244f734d
15 changed files with 420 additions and 6 deletions
  1. 6 5
      zjugis-gateway/src/main/resources/application.yaml
  2. 1 1
      zjugis-module-business/zjugis-module-business-api/src/main/java/com/zjugis/module/business/enums/ApiConstants.java
  3. 8 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/css/local.css
  4. 1 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/js/local.js
  5. 1 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/js/localSelf.js
  6. 5 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/local.ftl
  7. 36 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/html.ftl
  8. 36 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/htmlApp.ftl
  9. 37 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/htmlMobile.ftl
  10. 93 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow.ftl
  11. 101 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow1.ftl
  12. 62 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow1111.ftl
  13. 13 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow222.ftl
  14. 10 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlowApp.ftl
  15. 10 0
      zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlowMobile.ftl

+ 6 - 5
zjugis-gateway/src/main/resources/application.yaml

@@ -37,13 +37,14 @@ spring:
           uri: grayLb://infra-server
           predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
             - Path=/admin/**
-        ## business-server 服务
-        - id: business-admin-api # 路由的编号
+        ## business 服务
+        - id: business # 路由的编号
           uri: grayLb://business
           predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
             - Path=/business/**
           filters:
-            - RewritePath=/business-api/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
+            - StripPrefix=1
+            - RewritePath=/business/v3/api-docs, /v3/api-docs
         - id: workflow # 路由的编号
           uri: grayLb://workflow
           predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
@@ -72,8 +73,8 @@ knife4j:
       - name: infra-server
         service-name: infra-server
         url: /admin-api/infra/v3/api-docs
-      - name: business-server
-        service-name: business-server
+      - name: business
+        service-name: business
         url: /admin-api/business/v3/api-docs
       - name: workflow
         service-name: workflow

+ 1 - 1
zjugis-module-business/zjugis-module-business-api/src/main/java/com/zjugis/module/business/enums/ApiConstants.java

@@ -14,7 +14,7 @@ public class ApiConstants {
      *
      * 注意,需要保证和 spring.application.name 保持一致
      */
-    public static final String NAME = "business-server";
+    public static final String NAME = "business";
 
     public static final String PREFIX = RpcConstants.RPC_API_PREFIX +  "/business";
 

+ 8 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/css/local.css

@@ -0,0 +1,8 @@
+.local{
+    color: #ffffff;
+    background: #4296d8;
+    width: 300px;
+    height: 300px;
+    line-height: 300px;
+    text-align: center;
+}

+ 1 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/js/local.js

@@ -0,0 +1 @@
+console.log("local js已引入");

+ 1 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/js/localSelf.js

@@ -0,0 +1 @@
+console.log("localSelf js已引入");

+ 5 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/LocalTempDemo/local.ftl

@@ -0,0 +1,5 @@
+<#macro master title='自创模板示例' javascripts=[''] styles=[''] >
+    <@h.html title=title javascripts=['/LocalTempDemo/js/local.js']+javascripts styles=styles+['/LocalTempDemo/css/local.css'] >
+        <#nested />
+    </@h.html>
+</#macro>

+ 36 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/html.ftl

@@ -0,0 +1,36 @@
+<#macro html title='title' javascripts=[''] styles=['']>
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width">
+        <title>${title}</title>
+        <link rel="stylesheet" type="text/css"
+              href="${UIURL!}/all.css<#if allJsVserion != ''>?version=${allJsVserion}</#if>">
+        <#list styles as style>
+            <#if (style!'')!=''>
+                <link rel="stylesheet" type="text/css"
+                      href="${style}<#if version != 'version'>?version=${version}</#if>"></link>
+            </#if>
+        </#list>
+    </head>
+
+    <body>
+    <#nested />
+
+    <footer>
+        <script type="text/javascript"
+                src="${UIURL!}/jquery.1.11.3.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
+        <script type="text/javascript"
+                src="${UIURL!}/all.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
+        <#list javascripts as js>
+            <#if (js!'')!=''>
+                <script type="text/javascript"
+                        src="${js}<#if version != 'version'>?version=${version}</#if>"></script>
+            </#if>
+        </#list>
+    </footer>
+    </body>
+    </html>
+</#macro>

+ 36 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/htmlApp.ftl

@@ -0,0 +1,36 @@
+<#macro htmlApp title='title' javascripts=[''] styles=['']>
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
+        <title>${title}</title>
+        <link rel="stylesheet" type="text/css"
+              href="${UIURL!}/all.mobile.css<#if allJsVserion != ''>?version=${allJsVserion}</#if>">
+        <#list styles as style>
+            <#if (style!'')!=''>
+                <link rel="stylesheet" type="text/css"
+                      href="${style}<#if version != 'version'>?version=${version}</#if>"></link>
+            </#if>
+        </#list>
+    </head>
+
+    <body>
+    <#nested />
+
+    <footer>
+        <script type="text/javascript"
+                src="${UIURL!}/jquery.1.11.3.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
+        <script type="text/javascript"
+                src="${UIURL!}/all.mobile.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
+        <#list javascripts as js>
+            <#if (js!'')!=''>
+                <script type="text/javascript"
+                        src="${js}<#if version != 'version'>?version=${version}</#if>"></script>
+            </#if>
+        </#list>
+    </footer>
+    </body>
+    </html>
+</#macro>

+ 37 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/htmlMobile.ftl

@@ -0,0 +1,37 @@
+<#macro htmlMobile title='title' javascripts=[''] styles=['']>
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta content="width=device-width, initial-scale=1.0" name="viewport" />
+        <title>${title}</title>
+        <link rel="stylesheet" type="text/css"
+              href="${UIURL!}/all.mobile.css<#if allJsVserion != ''>?version=${allJsVserion}</#if>">
+        <#list styles as style>
+            <#if (style!'')!=''>
+                <link rel="stylesheet" type="text/css"
+                      href="${style}<#if version != 'version'>?version=${version}</#if>"></link>
+            </#if>
+        </#list>
+    </head>
+
+    <body>
+    <#nested />
+
+    <footer>
+        <script type="text/javascript"
+                src="${UIURL!}/jquery.1.11.3.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
+        <script src="https://g.alicdn.com/dingding/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script>
+        <script type="text/javascript"
+                src="${UIURL!}/all.mobile.min.js<#if allJsVserion != ''>?version=${allJsVserion}</#if>"></script>
+        <#list javascripts as js>
+            <#if (js!'')!=''>
+                <script type="text/javascript"
+                        src="${js}<#if version != 'version'>?version=${version}</#if>"></script>
+            </#if>
+        </#list>
+    </footer>
+    </body>
+    </html>
+</#macro>

+ 93 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow.ftl

@@ -0,0 +1,93 @@
+<#setting number_format="0.####">
+<#macro workFlow title='工作流' javascripts=[''] styles=['']>
+    <@h.html title=title
+    javascripts = (WORKFLOW.JS![])+javascripts
+    styles= (WORKFLOW.CSS![]) + styles >
+        ${WORKFLOW.LEFT!}
+        <div class="z-position workflow-main" ${WORKFLOW.MainStyle!}>
+            <#if WORKFLOW.LEFT?has_content>
+                <div class="oa_formBox oa_formBox2">
+            <#else>
+                <div class="oa_formBox">
+            </#if>
+                ${WORKFLOW.TOP!}
+            </div>
+            ${WORKFLOW.RBefore!}
+            <#nested />
+            ${WORKFLOW.RAfter!}
+        </div>
+    <style type="text/css">
+        .workflow-main {
+            top: 0px;
+        }
+        .batch-operation-btns {
+            border-bottom: 1px solid #e6e9ef;
+        }
+        .oa_formBox2 {
+            margin-left: 275px;
+        }
+        .oa_formBox2 .workflow-title {
+            text-align: center;
+            padding-top: 15px;
+            padding-left: 20px;
+        }
+        .oa_formBox2 ul[name=workflow-top-btns] {
+        }
+        .workflow-right {
+            top: 70px;
+        }
+        .oa_formBox .btn-info {
+            background: #2E77E6;
+        }
+        .oa_formBox .z-comp-input,
+        .oa_formBox .z-comp-inputsearch,
+        .oa_formBox .z-comp-inputselect,
+        .oa_formBox .z-comp-select,
+        .oa_formBox .z-comp-selectsearch,
+        .oa_formBox .z-comp-selecttree,
+        .oa_formBox .z-comp-textarea,
+        .oa_formBox .z-selecttree {
+            border-color: #DEE0E3;
+        }
+        .oa_formBox .z-border-title {
+            border: 0px;
+            color: #2D333C;
+        }
+        /*.oa_formBox_line .z-form-group {*/
+        /*display: flex;*/
+        /*flex-direction: column;*/
+        /*}*/
+        /*.oa_formBox_line .z-form-row .z-form-label,*/
+        /*.oa_formBox_line .z-form-group .z-form-label {*/
+        /*text-align: left;*/
+        /*}*/
+        /*.oa_formBox_line .z-form-row .z-form-control,*/
+        /*.oa_formBox_line .z-form-group .z-form-control {*/
+        /*width: 100%;*/
+        /*}*/
+    </style>
+    <script>
+        var acid = getUrlParam("activityInstanceId");
+        if(acid) {
+            var elements = document.querySelectorAll('.opinionEdit[activityinstanceid="' + acid + '"]');
+            for (var i = 0; i < elements.length; i++) {
+                var element = elements[i];
+                var yjnrElement = element.querySelector('[name=yjnr]');
+                if (yjnrElement && !yjnrElement.value) {
+                    yjnrElement.value = "同意";
+                }
+            }
+        }
+
+        function getUrlParam(param) {
+            var regex = new RegExp('[?&]' + param + '(=([^&#]*)|&|#|$)');
+            var url = window.location.href;
+            var results = regex.exec(url);
+
+            if (!results) return null;
+            if (!results[2]) return '';
+            return decodeURIComponent(results[2].replace(/\+/g, ' '));
+        }
+    </script>
+    </@h.html>
+</#macro>

+ 101 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow1.ftl

@@ -0,0 +1,101 @@
+<#macro workFlow title='工作流' javascripts=[''] styles=['']>
+
+    <#switch WORKFLOW.CHILD!>
+    <#--        普通页面,非工作流页-->
+        <#case "1">
+            <head>
+                <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+                <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+                <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
+                <title>${title}</title>
+                <#list styles as style>
+                    <#if (style!'')!=''>
+                        <link rel="stylesheet" type="text/css"
+                              href="${style}<#if version != 'version'>?version=${version}</#if>"></link>
+                    </#if>
+                </#list>
+            </head>
+            <body>
+            <#nested />
+            <footer>
+                <#list javascripts as js>
+                    <#if (js!'')!=''>
+                        <script type="text/javascript"
+                                src="${js}<#if version != 'version'>?version=${version}</#if>"></script>
+                    </#if>
+                </#list>
+            </footer>
+            </body>
+            <#break>
+        <#--        2,包括工作流页面所有js,css外部文件,但是不包括左侧节点,顶部按钮-->
+        <#case "2">
+            <@h.html title=title javascripts=[
+            <#--            '${WORKFLOW.URL!}/js/workFlow.js',-->
+            '${WORKFLOW.URL!}/js/config.js',
+            '${WORKFLOW.URL!}/js/flow.js',
+            '${WORKFLOW.URL!}/js/headBtn.js',
+            '${WORKFLOW.URL!}/js/zFileUploadBase.js',
+            '${WORKFLOW.URL!}/js/js/filePreview.js',
+            '${WORKFLOW.URL!}/IFlowMaterials/levelgrid/levelgrid.js',
+            '${WORKFLOW.URL!}/IFlowOpinion/tempOpinion/flowOpinionTemp.js',
+            '${WORKFLOW.URL!}/js/messager.js' ]+javascripts
+            styles=[
+            <#--'${WORKFLOW.URL!}/IFlowOpinion/tempOpinion/flowOpinionTemp.common',-->
+            '${WORKFLOW.URL!}/IFlowMaterials/levelgrid/levelgrid.css',
+            '${WORKFLOW.URL!}/css/workFlow.css'] + styles >
+                <script>
+					var workflowHost = "${WORKFLOW.URL!}";
+                </script>
+                <div class="z-position workflow-main" style="top:0;">
+                    <div class="workflow-form">
+                        <#nested />
+                    </div>
+                </div>
+            </@h.html>
+            <#break>
+        <#--        完整的工作流页面-->
+        <#default>
+            <@h.html title=title javascripts=[
+            <#--            '${WORKFLOW.URL!}/js/workFlow.js',-->
+            '${WORKFLOW.URL!}/js/config.js',
+            '${WORKFLOW.URL!}/js/flow.js',
+            '${WORKFLOW.URL!}/js/headBtn.js',
+            '${WORKFLOW.URL!}/js/zFileUploadBase.js',
+            '${WORKFLOW.URL!}/js/filePreview.js',
+            '${WORKFLOW.URL!}/IFlowMaterials/levelgrid/levelgrid.js',
+            '${WORKFLOW.URL!}/IFlowOpinion/tempOpinion/flowOpinionTemp.js',
+            '${WORKFLOW.URL!}/js/messager.js' ]+javascripts
+            styles=[
+            <#--'${WORKFLOW.URL!}/IFlowOpinion/tempOpinion/flowOpinionTemp.common',-->
+            '${WORKFLOW.URL!}/IFlowMaterials/levelgrid/levelgrid.css',
+            '${WORKFLOW.URL!}/css/workFlow.css'] + styles >
+                <script>
+					var workflowHost = "${WORKFLOW.URL!}";
+                </script>
+                <div class="workflow-top batch-operation-btns clearfix text-right">
+                    <span class="workflow-title">${WORKFLOW.NAME!}
+<#--                        <#if WORKFLOW.DESC??>-->
+<#--                            <span title="${WORKFLOW.DESC!}" class="des">[<span>${WORKFLOW.DESC!}</span>]</span>-->
+<#--                        </#if>-->
+                        </span>
+                    ${WORKFLOW.BUTTON!}
+                </div>
+                <div class="z-position workflow-main">
+                    <div class="workflow-left z-btn-bar text-left ">
+                        <div class="workflow-slidebtn left-open left"></div>
+                        <div class="workflow-slidebtn left-close left"></div>
+                        <div class="workflow-slidebtn right-open right"></div>
+                        <div class="workflow-slidebtn right-close right"></div>
+                        ${WORKFLOW.LEFT!}
+                    </div>
+                    <div class="z-position workflow-right">
+                        <div name="right_${WORKFLOW.activityInstanceId!}">
+                            <div class="workflow-form">
+                                <#nested />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </@h.html>
+    </#switch>
+</#macro>

+ 62 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow1111.ftl

@@ -0,0 +1,62 @@
+<#macro workFlow title='工作流' javascripts=[''] styles=['']>
+    <@h.html title=title
+    javascripts = (WORKFLOW.JS![])+javascripts
+    styles= (WORKFLOW.CSS![]) + styles >
+        <div class="z-position workflow-main" ${WORKFLOW.MainStyle!} style="top: 0px;">
+            ${WORKFLOW.LEFT!}
+            <div class="workflow-right right z-position oa_formBox oa_formBox_line ${WORKFLOW.MainStyle!}">
+                <div>
+                    ${WORKFLOW.TOP!}
+                </div>
+                <div>
+                    ${WORKFLOW.RBefore!}
+                    <#nested />
+                    ${WORKFLOW.RAfter!}
+                </div>
+            </div>
+        </div>
+    <style type="text/css">
+        .oa_formBox>div:nth-child(1)>.workflow-top {
+            display: flex;
+            flex-direction: column;
+        }
+        .oa_formBox>div:nth-child(2){
+            position: relative;
+            height: calc(100% - 110px)
+        }
+        .oa_formBox>div:nth-child(2)>.z-position {
+            float: none;
+            position: static;
+        }
+        .oa_formBox .btn-info {
+            background: #2E77E6;
+        }
+        .oa_formBox .z-comp-input,
+        .oa_formBox .z-comp-inputsearch,
+        .oa_formBox .z-comp-inputselect,
+        .oa_formBox .z-comp-select,
+        .oa_formBox .z-comp-selectsearch,
+        .oa_formBox .z-comp-selecttree,
+        .oa_formBox .z-comp-textarea,
+        .oa_formBox .z-selecttree {
+            border-color: #DEE0E3;
+        }
+        .oa_formBox .z-border-title {
+            border: 0px;
+            color: #2D333C;
+        }
+        /*.oa_formBox_line .z-form-group {*/
+            /*display: flex;*/
+            /*flex-direction: column;*/
+        /*}*/
+        /*.oa_formBox_line .z-form-row .z-form-label,*/
+        /*.oa_formBox_line .z-form-group .z-form-label {*/
+            /*text-align: left;*/
+        /*}*/
+        /*.oa_formBox_line .z-form-row .z-form-control,*/
+        /*.oa_formBox_line .z-form-group .z-form-control {*/
+            /*width: 100%;*/
+        /*}*/
+    </style>
+    </@h.html>
+</#macro>

+ 13 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlow222.ftl

@@ -0,0 +1,13 @@
+<#macro workFlow title='工作流' javascripts=[''] styles=['']>
+    <@h.html title=title
+    javascripts = (WORKFLOW.JS![])+javascripts
+    styles= (WORKFLOW.CSS![]) + styles >
+        ${WORKFLOW.TOP!}
+        <div class="z-position workflow-main" ${WORKFLOW.MainStyle!}>
+            ${WORKFLOW.LEFT!}
+            ${WORKFLOW.RBefore!}
+            <#nested />
+            ${WORKFLOW.RAfter!}
+        </div>
+    </@h.html>
+</#macro>

+ 10 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlowApp.ftl

@@ -0,0 +1,10 @@
+<#macro workFlowApp title=WORKFLOW.flowName!'' javascripts=[''] styles=['']>
+    <@ha.htmlApp title=title javascripts= (WORKFLOW.JS![]) +javascripts
+    styles= (WORKFLOW.CSS![]) + styles >
+        <div class="z-position z-navigation-container" style="bottom: 2rem;">
+            ${WORKFLOW.TOP!}
+            <#nested />
+            ${WORKFLOW.BOTTOM!}
+        </div>
+    </@ha.htmlApp>
+</#macro>

+ 10 - 0
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/public/workFlowMobile.ftl

@@ -0,0 +1,10 @@
+<#macro workFlowMobile title=WORKFLOW.flowName!'' javascripts=[''] styles=['']>
+    <@hm.htmlMobile title=title javascripts= (WORKFLOW.JS![]) +javascripts
+    styles= (WORKFLOW.CSS![]) + styles >
+        <div class="z-position z-navigation-container" style="bottom: 2rem;">
+            ${WORKFLOW.TOP!}
+            <#nested />
+            ${WORKFLOW.BOTTOM!}
+        </div>
+    </@hm.htmlMobile>
+</#macro>