admin 2月15号

admin-ui/app/whepi/index.js

@@ -2,9 +2,11 @@ var userRole = 0;
 $(function () {
   //隐藏角色上的提示红点
   $('#role-name-num').hide();
+
   function doSearch(text) {
     $('#menutree').tree('search', text);
   }
+
   App.init(function () {
     document.onkeydown = function (event) {
       if (event.ctrlKey && event.keyCode === 191) {
@@ -69,6 +71,27 @@ $(function () {
         onLoadSuccess: function (node, data) {
         }
       });
+    } else if (userRole == "5") {//指挥部登录
+      $('#menutree').tree({
+        url: '/app/whepi/mock/menu5.json',
+        onDblClick: function (node) {
+          var $this = $(this);
+          if (!$this.tree('isLeaf', node.target)) {
+            $this.tree(node.state === 'closed' ? 'expand' : 'collapse', node.target);
+          }
+        },
+        onSelect: function () {
+          return false;
+        },
+        onClick: function (node) {
+          var href = node.href;
+          if ($.trim(href)) {
+            App.addTab({title: node.text, url: node.href, id: node.id, iconCls: node.iconCls});
+          }
+        },
+        onLoadSuccess: function (node, data) {
+        }
+      });
     }
 
 
@@ -157,7 +180,7 @@ var App = {
 
     } else {
       iframe = '<iframe src="' + params.url +
-          '" scrolling="auto" frameborder="0" style="width:100%;height:100%;"></iframe>';
+        '" scrolling="auto" frameborder="0" style="width:100%;height:100%;"></iframe>';
     }
 
     $tt.tabs('add', {

admin-ui/app/whepi/mock/menu.json

@@ -11,14 +11,6 @@
       "children": []
     },
     {
-      "id": "ENT10001",
-      "text": "团购系统",
-      "href": "/app/whepi/tugou/tugou.js",
-      "iconCls": "icon-blank fa fa-align-justify",
-      "state": "close",
-      "children": []
-    },
-    {
       "id": "ENT10002",
       "text": "小区进出信息",
       "href": "",

admin-ui/app/whepi/mock/menu5.json

@@ -0,0 +1,14 @@
+{
+  "success": true,
+  "msg": "",
+  "data": [
+    {
+      "id": "ENT10001",
+      "text": "团购系统",
+      "href": "/app/whepi/tugou/tugou.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    }
+  ]
+}

whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java

@@ -1,6 +1,7 @@
 package com.bofeng.service;
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.JwtHelper;
 import com.bofeng.dao.JmTuangouDao;
 import com.bofeng.dao.YeweihuiSysOwnerMapper;
 import com.bofeng.dao.YeweihuiUserRoleMapper;
@@ -88,7 +89,7 @@ public class JmTuangouService {
 
             jmTuangou.setTgEndTime(jmTuangou.gettgEndTime);
             jmTuangou.setTgDeliverTime(tgDeliverTime);*/
-      jmTuangou.setUserId(jmTuangouDao.selectByUserId().getUserId());
+      jmTuangou.setUserId(JwtHelper.getUserId());
       success = jmTuangouDao.insert(jmTuangou);
     }
     return success;

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -1,5 +1,6 @@
 package com.bofeng.wx.controller;
 
+import com.bofeng.JwtHelper;
 import com.bofeng.dao.RbMapper;
 import com.bofeng.dao.UptownMapper;
 import com.bofeng.entity.*;
@@ -369,9 +370,9 @@ public class YeWeiHuiController {
   public Model whepiTuangoulist(@Pd(name = "userId", required = false) Long userId, @Pd(name = "uptownIds", required = false) String uptownIds, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "tgStatus", required = false) Long tgStatus,
                                 PageDb pageDb) {
     //系统管理员只有一个人 获取当前userId
-    JmTuangou jmTuangou = jmTuangouService.selectByUserId();
+   // JmTuangou jmTuangou = jmTuangouService.selectByUserId();
 
-    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(jmTuangou.getUserId(),
+    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(JwtHelper.getUserId(),
       uptownIds, queryProperties, tgStatus, pageDb);
 
     return Model.newSuccess(pageDb, myList);

whepi-web/src/main/resources/application-guojing.yml

@@ -65,8 +65,8 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
-    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: whepi_test
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: root
     password: 123456
 
   redis: