Merge branch 'feature-refactor' of ssh://10.10.100.21/source/platform-bi-server into feature-refactor

bi-server/pom.xml

@@ -28,10 +28,11 @@
       <artifactId>bi-auth</artifactId>
     </dependency>
     <!-- Mysql -->
-    <dependency>
+    <!--<dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
     </dependency>
+    -->
     <!-- oracle -->
     <dependency>
       <groupId>ojdbc6</groupId>

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

@@ -64,8 +64,8 @@ public interface ShowChartsMapper {
                           @Param("screen") String screen);
 
     //查询分组的值(柱状图)->优化后
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn} and ${xColumn} ${screen}")
-    List<Double> getGroupsValues(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
+    @Select("select ${dataType}(${yAxisName}) count,${groupsColumn}, ${xColumn} from ${tableName} GROUP BY  ${groupsColumn},${xColumn}")
+    List<Map<String, Object>> getGroupsValues(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
                                  @Param("groupsColumn") String groupsColumn, @Param("xColumn") String xColumn, @Param("screen") String screen);
 
     //时间类型的X轴

bi-server/src/main/java/com/usoftchina/bi/server/dao/user/UserMapper.java

@@ -22,7 +22,7 @@ public interface UserMapper {
      * 查询UAS的人员资料表数据
      * @return
      */
-    @Select("SELECT EM_DEFAULTHSNAME as department, EM_TYPE role, EM_DEPART as post, EM_NAME as name, EM_PASSWORD as passWord, "
+    @Select("SELECT EM_ID as id,EM_DEFAULTHSNAME as department, EM_TYPE role, EM_DEPART as post, EM_NAME as name, EM_PASSWORD as passWord, "
             + "EM_MOBILE as phone, EM_CODE as userName,EM_CLASS AS state FROM EMPLOYEE")
     List<User> getUASEmployee();
 
@@ -30,17 +30,18 @@ public interface UserMapper {
      * 批量插入人员资料
      * @param userList
      */
-    @Insert("<script"
+    @Insert("<script>"
             + "INSERT INTO BI_USERS(BU_ID, BU_NAME, BU_POST, USER_NAME, PASS_WORD, BU_DEPARTMENT, CREATE_DATE) "
-            + "SELECT BI_USERS_SEQ.NEXTVAL,M.* FROM ("
+            + "SELECT M.* FROM ("
             +   "<foreach collection=\"list\" item=\"item\" index=\"index\" separator=\"UNION ALL\">"
             +       "SELECT "
-            +           "#{name, jdbcType=VARCHAR},"
-            +           "#{post, jdbcType=VARCHAR},"
-            +           "#{userName, jdbcType=VARCHAR},"
-            +           "#{passWord, jdbcType=VARCHAR},"
-            +           "#{department, jdbcType=VARCHAR},"
-            +           "SYSDATE"
+            +           "#{item.id, jdbcType=INTEGER},"
+            +           "#{item.name, jdbcType=VARCHAR},"
+            +           "#{item.post, jdbcType=VARCHAR},"
+            +           "#{item.userName, jdbcType=VARCHAR},"
+            +           "#{item.passWord, jdbcType=VARCHAR},"
+            +           "#{item.department, jdbcType=VARCHAR},"
+            +           "SYSDATE "
             +       "FROM DUAL"
             +   "</foreach>"
             + ")M"
@@ -66,7 +67,7 @@ public interface UserMapper {
             " <if test=\"post != null\">BU_POST = #{post,jdbcType=VARCHAR}, </if>" +
             " <if test=\"department != null\">BU_DEPARTMENT = #{department,jdbcType=VARCHAR}, </if>" +
             " <if test=\"role != null\">BU_ROLE = #{role,jdbcType=VARCHAR}, </if>" +
-            " <if test=\"phone != null\">BU_ROLE = #{BU_PHONE,jdbcType=VARCHAR}, </if>" +
+            " <if test=\"phone != null\">BU_PHONE = #{phone,jdbcType=VARCHAR}, </if>" +
             "  updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss')" +
             "  where bu_id = #{id,jdbcType=INTEGER}" +
             " </script>")

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

@@ -161,12 +161,10 @@ public class ShowHistogramService {
                         chartsDataInfo.setTooMany(true);
                     }
                     List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screenToColumnS, histogramConfigInfo.getMaxCount()); //查询每个分组系列
-                    Iterator itGroupsData = groupsData.iterator();
-
                     //每个分组得到得每个系列
-                    while(itGroupsData.hasNext()){
+                    for(int i = 0, len = groupsData.size() > 5 ? 5 : groupsData.size(); i < len; i++){
                         Series ne = new Series();
-                        String groupsName = (String)itGroupsData.next();
+                        String groupsName = groupsData.get(i);
                         ne.setName(groupsName);
                         ne.setStack(groupByName);
 
@@ -205,16 +203,6 @@ public class ShowHistogramService {
                             }
                             groupsValue.add(groupsValueOne);
                         }
-
-                        /*if ("time".equals(xColumnType)){
-                            groupsValue = timeConverterUtil.getHistogramGroupTime(yAxisType, yColumn, tableName, groupByName, xAxisType,
-                                    groupsName, xColumn, xAxisData, screenToColumnS);
-                        }else {
-                            String xColumnKey = xColumn;
-                            String groupByKey =groupByName + " = '" +groupsName +"'";
-                            groupsValue = showChartsMapper.getGroupsValues(yAxisType, yColumn, tableName, groupByKey, xColumnKey, screenToColumnS);
-                        }*/
-
                         ne.setValue(groupsValue);
                         serieses.add(ne);
                     }

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

@@ -31,7 +31,7 @@ public class SynchronizeEmpInfo {
                        + "  UPDATE  SET TARGETTABLE.BU_CLASS = SOURCETABLE.EM_CLASS, TARGETTABLE.PASS_WORD = SOURCETABLE.EM_PASSWORD "
                        + "WHEN NOT MATCHED THEN"
                        + "  INSERT (BU_ID,BU_NAME,BU_DEPARTMENT,BU_POST,BU_USER_GROUP,USER_NAME,PASS_WORD,BU_ROLE,CREATE_DATE,UPDATA_DATE,USER_TOKEN,BU_PHONE,BU_CLASS) "
-                       + "  VALUES (BI_USERS_SEQ.NEXTVAL,SOURCETABLE.EM_NAME,SOURCETABLE.EM_DEFAULTHSNAME,SOURCETABLE.EM_DEPART,NULL,SOURCETABLE.EM_CODE,SOURCETABLE.EM_PASSWORD,SOURCETABLE.EM_TYPE,SYSDATE,NULL,NULL,SOURCETABLE.EM_MOBILE,SOURCETABLE.EM_CLASS)";
+                       + "  VALUES (SOURCETABLE.EM_ID,SOURCETABLE.EM_NAME,SOURCETABLE.EM_DEFAULTHSNAME,SOURCETABLE.EM_DEPART,NULL,SOURCETABLE.EM_CODE,SOURCETABLE.EM_PASSWORD,SOURCETABLE.EM_TYPE,SYSDATE,NULL,NULL,SOURCETABLE.EM_MOBILE,SOURCETABLE.EM_CLASS)";
 
     @Scheduled(cron = "0 0 1 * * ?")
     private void syncEmpInfo(){

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

@@ -65,7 +65,7 @@ public class UserService {
             user.setRole(role);
             int userId = userMapper.getUserId(userName);
             user.setId(userId);
-            if (!pws.equals(EncryUtil.decryptPassword(password))){
+            if (!pws.equals(password)){
                 //更新密码
                 userMapper.updateUser(user);
             }else {
@@ -106,7 +106,7 @@ public class UserService {
         }
         String password = user.getPassWord();
         String pw = EncryUtil.decryptPassword(password);
-        if (!pws.equals(pw)){
+        if (!EncryUtil.decryptPassword(pws).equals(pw)){
             throw new MyException(RepCode.NoUser);
         }
         return user;

bi-server/src/main/resources/application-dev.properties

@@ -1,10 +1,9 @@
-profile = dev_envrimont  
 #数据连接池：据说阿里的最好
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 
 #数据库驱动
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
 #数据库连接地址
-spring.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+spring.datasource.url=jdbc:oracle:thin:@10.1.81.2:1521:orcl
 spring.datasource.username=UAS_DEV
 spring.datasource.password=select!#%*(

bi-server/src/main/resources/application-prod.properties

@@ -1,4 +1,3 @@
-profile = prod_envrimont  
 #数据连接池：据说阿里的最好
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 

bi-server/src/main/resources/application-uas.properties

@@ -0,0 +1,82 @@
+#数据连接池：据说阿里的最好
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+
+#数据库驱动
+spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
+#数据库连接地址
+#默认数据源
+spring.datasource.url=jdbc:oracle:thin:@10.1.81.2:1521:orcl
+spring.datasource.username=UAS
+spring.datasource.password=select!#%*(
+
+spring.jackson.date-format=yyyy-MM-dd
+spring.jackson.time-zone=GMT+8
+
+#线上环境
+#spring.datasource.url=jdbc:oracle:thin:@218.18.115.198:1523:orcl
+#spring.datasource.username=BI_ADMIN
+#spring.datasource.password=admin
+
+
+#slave.datasource.names=UAS,UAS_DEV,YITOA_DATACENTER,N_USOFTSYS
+#//UAS标准版
+#slave.datasource.UAS.driver-class-name=oracle.jdbc.driver.OracleDriver
+#slave.datasource.UAS.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
+#slave.datasource.UAS.username=UAS
+#slave.datasource.UAS.password=select!#%*(
+#
+#//研发
+#slave.datasource.UAS_DEV.driver-class-name=oracle.jdbc.driver.OracleDriver
+#slave.datasource.UAS_DEV.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
+#slave.datasource.UAS_DEV.username=UAS_DEV
+#slave.datasource.UAS_DEV.password=select!#%*(
+#
+#//英唐资料中心
+#slave.datasource.YITOA_DATACENTER.driver-class-name=oracle.jdbc.driver.OracleDriver
+#slave.datasource.YITOA_DATACENTER.url=jdbc:oracle:thin:@10.1.1.168:1521:orcl
+#slave.datasource.YITOA_DATACENTER.username=YITOA_DATACENTER
+#slave.datasource.YITOA_DATACENTER.password=select!#%*(
+#
+#//优软科技
+#slave.datasource.N_USOFTSYS.driver-class-name=oracle.jdbc.driver.OracleDriver
+#slave.datasource.N_USOFTSYS.url=jdbc:oracle:thin:@10.1.1.168:1521:orcl
+#slave.datasource.N_USOFTSYS.username=N_USOFTSYS
+#slave.datasource.N_USOFTSYS.password=select!#%*(
+#
+#//
+#slave.datasource.N_WILIC.driver-class-name=oracle.jdbc.driver.OracleDriver
+#slave.datasource.N_WILIC.url=jdbc:oracle:thin:@218.18.115.198:1521:orcl
+#slave.datasource.N_WILIC.username=N_WILIC
+#slave.datasource.N_WILIC.password=select!#%*(
+
+
+
+spring.jpa.database=oracle
+
+#最大空闲值.当经过一个高峰时间后，连接池可以慢慢将已经用不到的连接慢慢释放一部分，一直减少到maxIdle为止
+spring.datasource.max-idle=10
+#最大等待值
+spring.datasource.max-wait=10000
+#最小空闲值.当空闲的连接数少于阀值时，连接池就会预申请去一些连接，以免洪峰来时来不及申请。
+spring.datasource.min-idle=5
+#连接池启动时的初始值
+spring.datasource.initial-size=5
+
+# 分页配置
+pagehelper-helper-dialect=mysql
+pagehelper-reasonable=true
+pagehelper-support-methods-arguments=true
+pagehelper-params=count=countSql
+
+#mybatis.typeAliasesPackage=com.usoftchina.bi.server.model.po
+#mybatis.config-locations=classpath:mybatis-config.xml
+#mybatis.mapperLocations=classpath:config/dao/*.xml
+mybatis.configuration.callSettersOnNulls=true
+
+
+server.port=8011
+server.servlet.context-path=/BI
+#server.session.timeout=10
+server.tomcat.uri-encoding=UTF-8
+#debug=true
+#logging.level.com.usoftchina.bi.server=debug

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

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>BI 商业智能平台</title>
-<link rel="shortcut icon" href="favicon.png"><link href="index.3f25d010.css" rel="stylesheet"></head>
+<link rel="shortcut icon" href="favicon.png"><link href="index.cebbd457.css" rel="stylesheet"></head>
 <body>
   <div id="root"></div>
-<script type="text/javascript" src="index.9af88545.js"></script></body>
+<script type="text/javascript" src="index.622dd580.js"></script></body>
 </html>