diff --git a/supervise-business-ui/src/router/index.js b/supervise-business-ui/src/router/index.js index 1f4b3085..e5aa41ce 100644 --- a/supervise-business-ui/src/router/index.js +++ b/supervise-business-ui/src/router/index.js @@ -32,19 +32,19 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/todo/index', + // component: Layout, + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/supervise-crm-ui/src/router/index.js b/supervise-crm-ui/src/router/index.js index 1f4b3085..02a1035b 100644 --- a/supervise-crm-ui/src/router/index.js +++ b/supervise-crm-ui/src/router/index.js @@ -32,19 +32,21 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/project/index' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue b/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue index d6bcf9da..efef6ee6 100644 --- a/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue +++ b/supervise-customer-ui/src/views/daydataupload/gdinventory/index.vue @@ -55,8 +55,8 @@ >刷新
下载库存日报表 - 下载门店商品总表 - 下载门店商品分表压缩包 +
没有报表文件
diff --git a/supervise-enterprise-ui/src/router/index.js b/supervise-enterprise-ui/src/router/index.js index 1f4b3085..b27b8833 100644 --- a/supervise-enterprise-ui/src/router/index.js +++ b/supervise-enterprise-ui/src/router/index.js @@ -32,19 +32,20 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/Yjsq/index' + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/supervise-message-ui/src/router/index.js b/supervise-message-ui/src/router/index.js index 1f4b3085..a879781c 100644 --- a/supervise-message-ui/src/router/index.js +++ b/supervise-message-ui/src/router/index.js @@ -32,19 +32,21 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/wdxx/index' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/supervise-organizational-ui/src/router/index.js b/supervise-organizational-ui/src/router/index.js index 1f4b3085..d9d62a36 100644 --- a/supervise-organizational-ui/src/router/index.js +++ b/supervise-organizational-ui/src/router/index.js @@ -32,19 +32,21 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/yhgl/index' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/supervise-portal-ui/src/router/index.js b/supervise-portal-ui/src/router/index.js index 6314f249..0536a492 100644 --- a/supervise-portal-ui/src/router/index.js +++ b/supervise-portal-ui/src/router/index.js @@ -34,19 +34,21 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: 'organizationManage' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, { path: '/region', component: Layout, diff --git a/supervise-report-ui/src/router/index.js b/supervise-report-ui/src/router/index.js index 1f4b3085..f12ddc76 100644 --- a/supervise-report-ui/src/router/index.js +++ b/supervise-report-ui/src/router/index.js @@ -32,19 +32,19 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/projectDaily/index', + // component: Layout, + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/supervise-risk-ui/src/router/index.js b/supervise-risk-ui/src/router/index.js index dc221da2..969f0bcc 100644 --- a/supervise-risk-ui/src/router/index.js +++ b/supervise-risk-ui/src/router/index.js @@ -34,19 +34,21 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/bjzx/index' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/warehousing-system/project_web_ui/src/router/index.js b/warehousing-system/project_web_ui/src/router/index.js index cfaa82a8..64a625ce 100644 --- a/warehousing-system/project_web_ui/src/router/index.js +++ b/warehousing-system/project_web_ui/src/router/index.js @@ -25,19 +25,21 @@ export const constantRoutes = [ }, { path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/initial_value/storehouse' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, ...codemenu, { diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkService.java index 07d5afb9..6c308370 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkService.java @@ -185,7 +185,7 @@ public class GdInventoryOkService extends MybatisBaseService - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] + redirect: '/dispatchmodletemplate/index' + + // component: Layout, + // redirect: '/index', + // children: [{ + // path: '/index', + // component: () => + // import('@/views/index.vue'), + // name: 'index', + // meta: { + // title: '主页', + // noCache: true, + // affix: true + // } + // }] }, { path: '/dispatchpatrolplan', diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/WxMessage.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/WxMessage.java index b8360790..9797230c 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/WxMessage.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/WxMessage.java @@ -15,7 +15,7 @@ public class WxMessage { private static final String WX_URL_MESSAGE_SEND = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN"; private static final String MP_URL_MESSAGE_SEND = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token=ACCESS_TOKEN"; - public static RespMessReturn sendMessage(String template_id, String touser, String pagepath, Map data) { + public static RespMessReturn sendMessageMiniProgram(String template_id, String touser, String pagepath, Map data) { String wxUrl = MP_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.mpAccessToken()); Map mp_template_msg = buildMsg(template_id, pagepath, data); @@ -55,7 +55,7 @@ public class WxMessage { return mp_template_msg; } - public static RespMessReturn sendMessage(String template_id, String touser, Map data) { + public static RespMessReturn sendMessageMiniProgram(String template_id, String touser, Map data) { String wxUrl = MP_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.mpAccessToken()); Map mp_template_msg = buildMsg(template_id, data); @@ -76,7 +76,7 @@ public class WxMessage { * @param data * @return */ - public static Map sendMessages(String template_id, List tousers, String pagepath, Map data) { + public static Map sendMessagesMiniProgram(String template_id, List tousers, String pagepath, Map data) { String wxUrl = MP_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.mpAccessToken()); Map mp_template_msg = buildMsg(template_id, pagepath, data); @@ -102,7 +102,7 @@ public class WxMessage { * @param data * @return */ - public static Map sendMessages(String template_id, List tousers, Map data) { + public static Map sendMessagesMiniProgram(String template_id, List tousers, Map data) { String wxUrl = MP_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.mpAccessToken()); Map mp_template_msg = buildMsg(template_id, data); @@ -129,28 +129,113 @@ public class WxMessage { * @param data * @return */ - public static RespMessReturn messageTemplateSend(String template_id, String touser, String pagepath, Map data) { + public static RespMessReturn sendMessage(String template_id, String touser, String pagepath, Map data) { String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.wxAccessToken()); //拼接base参数 - Map sendBody = new HashMap<>(); - sendBody.put("template_id", template_id);// 模板Id + Map sendBody = buildMessageBody(template_id, pagepath, data); sendBody.put("touser", touser); // openId - Map miniprogram = new HashMap<>(); - miniprogram.put("appid", WxConfig.MP_APPID); - miniprogram.put("pagepath", pagepath); - sendBody.put("miniprogram", miniprogram); + ResponseEntity forEntity = new RestTemplate().postForEntity(wxUrl, sendBody, RespMessReturn.class); + RespMessReturn body = forEntity.getBody(); + body.setSendData(sendBody); + return body; + } + + /** + * 微信公众号发送消息，不打开小程序 + * + * @param template_id + * @param touser + * @param data + * @return + */ + public static RespMessReturn sendMessage(String template_id, String touser, Map data) { + String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.wxAccessToken()); + + Map sendBody = buildMessageBody(template_id, data); + sendBody.put("touser", touser); // openId + + ResponseEntity forEntity = new RestTemplate().postForEntity(wxUrl, sendBody, RespMessReturn.class); + RespMessReturn body = forEntity.getBody(); + body.setSendData(sendBody); + return body; + } + + /** + * 微信公众号发送消息，向多个用户发送 + * + * @param template_id + * @param tousers + * @param pagepath + * @param data + * @return + */ + public static Map sendMessages(String template_id, List tousers, String pagepath, Map data) { + String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.wxAccessToken()); + //拼接base参数 + Map sendBody = buildMessageBody(template_id, pagepath, data); + Map ret = new HashMap<>(); + for (String touser : tousers) { + sendBody.put("touser", touser); + ResponseEntity forEntity = new RestTemplate().postForEntity(wxUrl, sendBody, RespMessReturn.class); + RespMessReturn body = forEntity.getBody(); + body.setSendData(sendBody); + ret.put(touser, body); + } + + return ret; + } + + /** + * 微信公众号发送消息，不打开小程序，向多个用户发送 + * + * @param template_id + * @param tousers + * @param data + * @return + */ + public static Map sendMessages(String template_id, List tousers, Map data) { + String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", WxConfig.wxAccessToken()); + + Map sendBody = buildMessageBody(template_id, data); + + Map ret = new HashMap<>(); + for (String touser : tousers) { + sendBody.put("touser", touser); + ResponseEntity forEntity = new RestTemplate().postForEntity(wxUrl, sendBody, RespMessReturn.class); + RespMessReturn body = forEntity.getBody(); + body.setSendData(sendBody); + ret.put(touser, body); + } + + return ret; + } + + + private static Map buildMessageBody(String template_id, Map data) { + //拼接base参数 + Map mp_template_msg = new HashMap<>(); + mp_template_msg.put("template_id", template_id);// 模板Id Map sendData = new HashMap<>(); data.forEach((key, val) -> { sendData.put(key, new TemplateDataValue(val)); }); - sendBody.put("data", sendData); + mp_template_msg.put("data", sendData); + mp_template_msg.put("url", ""); // 点击模板信息跳转地址 + mp_template_msg.put("topcolor", "#FF0000"); // 顶色 + return mp_template_msg; + } - sendBody.put("url", ""); // 点击模板信息跳转地址 - sendBody.put("topcolor", "#FF0000"); // 顶色 + private static Map buildMessageBody(String template_id, String pagepath, Map data) { + //拼接base参数 + Map mp_template_msg = buildMessageBody(template_id, data); - ResponseEntity forEntity = new RestTemplate().postForEntity(wxUrl, sendBody, RespMessReturn.class); - return forEntity.getBody(); + Map miniprogram = new HashMap<>(); + miniprogram.put("appid", WxConfig.MP_APPID); + miniprogram.put("pagepath", pagepath); + mp_template_msg.put("miniprogram", miniprogram); + + return mp_template_msg; } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java index ae8aedd8..bfe682f7 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/WxMessageTest.java @@ -16,9 +16,9 @@ public class WxMessageTest { data.put("time1", "2003-03-15"); data.put("thing2", "监管数据总览"); data.put("thing3", "aaa"); - RespMessReturn respMessReturn = WxMessage.messageTemplateSend(template_id, touser, pagepath, data); - System.out.println(respMessReturn.getErrcode()); - System.out.println(respMessReturn.getErrmsg()); +// RespMessReturn respMessReturn = WxMessage.messageTemplateSend(template_id, touser, pagepath, data); +// System.out.println(respMessReturn.getErrcode()); +// System.out.println(respMessReturn.getErrmsg()); } // @Test public void testSendMessage() {