Merge remote-tracking branch 'origin/feature-refactor' into feature-refactor

# Conflicts:
#	bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ShowChartsMapper.java

@@ -61,7 +61,7 @@ public interface ShowChartsMapper {
     /*
     查询筛选列信息
      */
-    @Select("select * from (select distinct ${columnName} from ${tableName} )where ${columnName} like '%'||#{keyword,jdbcType=VARCHAR}||'%' and rownum <= #{count, jdbcType=INTEGER}")
+    @Select("select * from (select distinct ${columnName} from ${tableName} )where upper(${columnName}) like upper('%'||#{keyword,jdbcType=VARCHAR}||'%') and rownum <= #{count, jdbcType=INTEGER}")
     List<Object> getScreenData(@Param("columnName") String columnName, @Param("tableName") String tableName, @Param("keyword") String keyword, @Param("count") int count);
 
     /**

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPieService.java

@@ -78,7 +78,8 @@ public class ShowPieService {
         int id = pieConfigInfo.getId();
         int baseId = getChartsDataUtilService.getBaseId(id);
         ChartsColumnConfig chartsColumn = chartsConfigMapper.getChartsColumn(id);
-        String tableName = chartsUtilService.getSqlStr(token, id, dashId) + " tmp ";
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
+        tableName = tableName==""?"":tableName + " tmp ";
         /* 参数校验 */
         if (ObjectUtils.isEmpty(chartsColumn)){
             return new RepEntity(RepCode.Null);

bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserPowerService.java

@@ -1,7 +1,9 @@
 package com.usoftchina.bi.server.service.user;
 
 import com.usoftchina.bi.core.base.BaseContextHolder;
+import com.usoftchina.bi.server.dao.dashboard.DashboardFavoriteMapper;
 import com.usoftchina.bi.server.dao.dashboard.DashboardsMapper;
+import com.usoftchina.bi.server.dao.dashboard.DefaultDashboardMapper;
 import com.usoftchina.bi.server.dao.user.UserMapper;
 import com.usoftchina.bi.server.dao.user.UserPowerMapper;
 import com.usoftchina.bi.server.model.vo.configVo.BatchUserPowerInfo;
@@ -28,6 +30,10 @@ public class UserPowerService {
     private UserMapper userMapper;
     @Autowired
     private DashboardsMapper dashboardsMapper;
+    @Autowired
+    private DashboardFavoriteMapper dashboardFavoriteMapper;
+    @Autowired
+    private DefaultDashboardMapper defaultDashboardMapper;
 
     /**
      * 新增用户(组)权限
@@ -55,6 +61,8 @@ public class UserPowerService {
     public void delete(UserPowerInfo userPowerInfo){
         userPowerMapper.delete(userPowerInfo);
         String content = getLogContent(userPowerInfo, "删除");
+        dashboardFavoriteMapper.remove(userPowerInfo.getDashboardId());
+        defaultDashboardMapper.delete(userPowerInfo.getDashboardId());
         messageLogService.delete("权限管理", null, BaseContextHolder.getUserName(), content);
     }
 

bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

@@ -66,9 +66,14 @@ public class UserService {
             }
             //如果用手机号查询到是UAS账户 则将该账号更新到已有账号
             if("mobile".equals(user.getPost())){
-                user = userMapper.getBIUserByName(user.getUserName());
-                user.setPhone(userName);
-                userMapper.updateUser(user);
+                //拿手机信息查询账户
+                User _user = userMapper.getBIUserByName(user.getUserName());
+                if(null == _user){
+                    userMapper.addUser(user);
+                }else{
+                    user.setPhone(userName);
+                    userMapper.updateUser(user);
+                }
             }else{
                 userMapper.addUser(user);
             }

bi-server/src/main/java/com/usoftchina/bi/server/utils/ScreenUtil.java

@@ -103,7 +103,7 @@ public class ScreenUtil {
                 symbol = "notIn".equals(symbol) ? "not in" : "in";
                 value = getNotInItems(columnType, type, value);
                 String symbVal = getTimeSymbAndVal(symbol, value);
-                String column = getTimeColumn(columnName, nowType);
+                String column = "time".equals(columnType)?getTimeColumn(columnName, nowType):columnName;
                 ret = ret + " and " + column + " " + symbVal;
 
             }else if (!("time".equals(columnType))) {

bi-server/src/main/resources/static/10.3c26a87b.async.js

@@ -0,0 +1 @@
+webpackJsonp([10],{CjY5:function(e,t,n){"use strict";var r=n("ErRd");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=r(n("seUp")),d=r(n("jjBy")),u=r(n("5JJ/")),o=r(n("ob2n")),s=r(n("lgE9")),i=r(n("EpvZ")),l=n("NmwX"),f=r(n("e4Ax")),c=(0,f.default)(function(){return n.e(14).then(n.bind(null,"gGMD"))}),p=function(e){function t(){return(0,a.default)(this,t),(0,u.default)(this,(0,o.default)(t).apply(this,arguments))}return(0,s.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props.match.params.code;return i.default.createElement(c,{dashboardDesigner:this.props.dashboardDesigner,code:e,isShareKeyView:!0})}}]),t}(i.default.Component),h=(0,l.connect)(function(e){return{dashboardDesigner:e.dashboardDesigner}})(p);t.default=h}});

bi-server/src/main/resources/static/10.cb992daa.async.js

@@ -1 +0,0 @@
-webpackJsonp([10],{CjY5:function(e,t,n){"use strict";var a=n("byc1");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(n("hLHU")),u=a(n("REWq")),d=a(n("ILJ3")),l=a(n("vm+1")),o=a(n("fgva")),i=a(n("EpvZ")),f=n("NmwX"),s=a(n("vyYx")),c=a(n("5j4t")),h=(0,s.default)({loader:function(){return n.e(14).then(n.bind(null,"gGMD"))},loading:function(){return i.default.createElement(c.default,null)}}),p=function(e){function t(){return(0,r.default)(this,t),(0,d.default)(this,(0,l.default)(t).apply(this,arguments))}return(0,o.default)(t,e),(0,u.default)(t,[{key:"render",value:function(){var e=this.props.match.params.code;return i.default.createElement(h,{dashboardDesigner:this.props.dashboardDesigner,code:e,isShareKeyView:!0})}}]),t}(i.default.Component),v=(0,f.connect)(function(e){return{dashboardDesigner:e.dashboardDesigner}})(p);t.default=v}});

bi-server/src/main/resources/static/11.ae0a139c.async.js → bi-server/src/main/resources/static/11.753e889d.async.js

@@ -1 +1 @@
-webpackJsonp([11],{"/UnF":function(e,n,t){"use strict";var o=t("byc1");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,t("VH7h");var i=o(t("BZy+")),a=o(t("hLHU")),l=o(t("REWq")),u=o(t("ILJ3")),d=o(t("vm+1")),r=o(t("fgva")),f=o(t("EpvZ")),c=function(e){function n(){var e,t;(0,a.default)(this,n);for(var o=arguments.length,i=new Array(o),l=0;l<o;l++)i[l]=arguments[l];return t=(0,u.default)(this,(e=(0,d.default)(n)).call.apply(e,[this].concat(i))),t.keydown=function(e){13===e.keyCode&&t.onOk()},t.onOk=function(){var e=t.props,n=e.okHandler,o=e.hideBox;"function"==typeof n&&n(),"function"==typeof o&&o()},t}return(0,r.default)(n,e),(0,l.default)(n,[{key:"componentDidMount",value:function(){window.addEventListener("keydown",this.keydown)}},{key:"componentWillUnmount",value:function(){window.removeEventListener("keydown",this.keydown)}},{key:"render",value:function(){var e=this.props,n=e.visibleBox,t=e.hideBox,o=e.title,a=e.text;return f.default.createElement(i.default,{title:o||"\u5220\u9664\u786e\u8ba4",visible:n,onCancel:t,onOk:this.onOk,destroyOnClose:!0},f.default.createElement("span",null,a||"\u786e\u5b9a\u8981\u5220\u9664\u8be5\u5bf9\u8c61\u5417\uff1f"))}}]),n}(f.default.Component),s=c;n.default=s}});
+webpackJsonp([11],{"/UnF":function(e,n,t){"use strict";var o=t("ErRd");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,t("VH7h");var i=o(t("BZy+")),l=o(t("seUp")),u=o(t("jjBy")),a=o(t("5JJ/")),d=o(t("ob2n")),r=o(t("lgE9")),f=o(t("EpvZ")),c=function(e){function n(){var e,t;(0,l.default)(this,n);for(var o=arguments.length,i=new Array(o),u=0;u<o;u++)i[u]=arguments[u];return t=(0,a.default)(this,(e=(0,d.default)(n)).call.apply(e,[this].concat(i))),t.keydown=function(e){13===e.keyCode&&t.onOk()},t.onOk=function(){var e=t.props,n=e.okHandler,o=e.hideBox;"function"==typeof n&&n(),"function"==typeof o&&o()},t}return(0,r.default)(n,e),(0,u.default)(n,[{key:"componentDidMount",value:function(){window.addEventListener("keydown",this.keydown)}},{key:"componentWillUnmount",value:function(){window.removeEventListener("keydown",this.keydown)}},{key:"render",value:function(){var e=this.props,n=e.visibleBox,t=e.hideBox,o=e.title,l=e.text;return f.default.createElement(i.default,{title:o||"\u5220\u9664\u786e\u8ba4",visible:n,onCancel:t,onOk:this.onOk,destroyOnClose:!0},f.default.createElement("span",null,l||"\u786e\u5b9a\u8981\u5220\u9664\u8be5\u5bf9\u8c61\u5417\uff1f"))}}]),n}(f.default.Component),s=c;n.default=s}});

bi-server/src/main/resources/static/8.e7fd2f1d.async.js

@@ -0,0 +1 @@
+webpackJsonp([8],{aDZT:function(e,t,n){"use strict";var r=n("ErRd");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=r(n("seUp")),d=r(n("jjBy")),u=r(n("5JJ/")),o=r(n("ob2n")),s=r(n("lgE9")),i=r(n("EpvZ")),l=n("NmwX"),f=r(n("e4Ax")),c=(0,f.default)(function(){return n.e(14).then(n.bind(null,"gGMD"))}),p=function(e){function t(){return(0,a.default)(this,t),(0,u.default)(this,(0,o.default)(t).apply(this,arguments))}return(0,s.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props.match.params.code;return i.default.createElement(c,{dashboardDesigner:this.props.dashboardDesigner,code:e})}}]),t}(i.default.Component),h=(0,l.connect)(function(e){return{dashboardDesigner:e.dashboardDesigner}})(p);t.default=h}});

bi-server/src/main/resources/static/8.fea02f49.async.js

@@ -1 +0,0 @@
-webpackJsonp([8],{aDZT:function(e,t,n){"use strict";var a=n("byc1");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(n("hLHU")),u=a(n("REWq")),d=a(n("ILJ3")),l=a(n("vm+1")),o=a(n("fgva")),f=a(n("EpvZ")),i=n("NmwX"),s=a(n("vyYx")),c=a(n("5j4t")),h=(0,s.default)({loader:function(){return n.e(14).then(n.bind(null,"gGMD"))},loading:function(){return f.default.createElement(c.default,null)}}),p=function(e){function t(){return(0,r.default)(this,t),(0,d.default)(this,(0,l.default)(t).apply(this,arguments))}return(0,o.default)(t,e),(0,u.default)(t,[{key:"render",value:function(){var e=this.props.match.params.code;return f.default.createElement(h,{dashboardDesigner:this.props.dashboardDesigner,code:e})}}]),t}(f.default.Component),v=(0,i.connect)(function(e){return{dashboardDesigner:e.dashboardDesigner}})(p);t.default=v}});

bi-server/src/main/resources/static/9.03a74572.async.js

@@ -0,0 +1 @@
+webpackJsonp([9],{GPN4:function(e,t,n){"use strict";var r=n("ErRd");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=r(n("seUp")),d=r(n("jjBy")),u=r(n("5JJ/")),o=r(n("ob2n")),s=r(n("lgE9")),i=r(n("EpvZ")),l=n("NmwX"),f=r(n("e4Ax")),c=(0,f.default)(function(){return n.e(14).then(n.bind(null,"gGMD"))}),p=function(e){function t(){return(0,a.default)(this,t),(0,u.default)(this,(0,o.default)(t).apply(this,arguments))}return(0,s.default)(t,e),(0,d.default)(t,[{key:"render",value:function(){var e=this.props.match.params.code;return i.default.createElement(c,{dashboardDesigner:this.props.dashboardDesigner,code:e,isShareView:!0})}}]),t}(i.default.Component),h=(0,l.connect)(function(e){return{dashboardDesigner:e.dashboardDesigner}})(p);t.default=h}});

bi-server/src/main/resources/static/9.6e9d0b47.async.js

@@ -1 +0,0 @@
-webpackJsonp([9],{GPN4:function(e,t,n){"use strict";var a=n("byc1");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(n("hLHU")),u=a(n("REWq")),d=a(n("ILJ3")),l=a(n("vm+1")),o=a(n("fgva")),i=a(n("EpvZ")),f=n("NmwX"),s=a(n("vyYx")),c=a(n("5j4t")),h=(0,s.default)({loader:function(){return n.e(14).then(n.bind(null,"gGMD"))},loading:function(){return i.default.createElement(c.default,null)}}),p=function(e){function t(){return(0,r.default)(this,t),(0,d.default)(this,(0,l.default)(t).apply(this,arguments))}return(0,o.default)(t,e),(0,u.default)(t,[{key:"render",value:function(){var e=this.props.match.params.code;return i.default.createElement(h,{dashboardDesigner:this.props.dashboardDesigner,code:e,isShareView:!0})}}]),t}(i.default.Component),v=(0,f.connect)(function(e){return{dashboardDesigner:e.dashboardDesigner}})(p);t.default=v}});

bi-server/src/main/resources/static/index.html

@@ -15,8 +15,8 @@
     }
   </script>
   <title>BI 商业智能平台</title>
-<link rel="shortcut icon" href="favicon.png"><link href="index.e3aad02c.css" rel="stylesheet"></head>
+<link rel="shortcut icon" href="favicon.png"><link href="index.017a62a6.css" rel="stylesheet"></head>
 <body>
   <div id="root"></div>
-<script type="text/javascript" src="index.34c69952.js"></script></body>
+<script type="text/javascript" src="index.94455b28.js"></script></body>
 </html>