1.修改添加数据源失败的BUG

src/main/java/com/config/RoleInterceptor/ConfigAdapter.java

@@ -16,7 +16,7 @@ public class ConfigAdapter implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(securityInterceptor())
                 .addPathPatterns("/DataBase/*").excludePathPatterns("/DataBase/getColumnData")
-        .addPathPatterns("/getUserList")
+        .addPathPatterns("/getUserList").addPathPatterns("/updateUser")
         .addPathPatterns("/Connector/*").excludePathPatterns("/Connector/getListDataConnector")
         .excludePathPatterns("/Connector/getConnectorGroup")
         .excludePathPatterns("/Connector/getConnectorData");

src/main/java/com/controller/user/UserController.java

@@ -1,13 +1,16 @@
 package com.controller.user;
 
 import com.config.RoleInterceptor.Auth;
+import com.model.po.User;
 import com.model.pojo.RepEntity;
+import com.model.pojo.annotation.CheckToken;
 import com.model.vo.configVo.LoginInfo;
 import com.model.vo.configVo.UserGroupInfo;
 import com.model.vo.configVo.UserGroupSetInfo;
 import com.server.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,6 +32,16 @@ public class UserController {
 //        return new RepEntity(RepCode.success);
     }
 
+    /*
+    更新用户信息
+     */
+    @Auth(user = "admin")
+    @CheckToken
+    @RequestMapping("/updateUser")
+    public RepEntity updateUser(@RequestHeader String token, @RequestBody User body){
+        return userService.updateUser(body);
+    }
+
     /*
     查询用户列表
      */

src/main/java/com/dao/chart/ShowChartsMapper.java

@@ -20,7 +20,7 @@ public interface ShowChartsMapper {
     int getNumForX(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName);
 
     //x轴
-    @Select("select DISTINCT ${xAxisName} from ${tableName} where rownum <= #{num}")
+    @Select("select * from (select DISTINCT ${xAxisName} from ${tableName}) where rownum <= #{num}")
     List<String> getXAxis(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("screenToColumn") String screenToColumn, @Param("num") int num);
 
 
@@ -174,7 +174,7 @@ public interface ShowChartsMapper {
     /*
     查询筛选列信息
      */
-    @Select("select distinct ${columnName} from ${tableName} where rownum <= 20")
+    @Select("select * from (select distinct ${columnName} from ${tableName} )where rownum <= 20")
     List<Object> getScreenData(@Param("columnName") String columnName, @Param("tableName") String tableName);
 
 }

src/main/java/com/dao/user/UserMapper.java

@@ -29,6 +29,7 @@ public interface UserMapper {
             " <if test=\"name != null\"> , bu_name = #{name} </if>" +
             " <if test=\"post != null\"> , BU_POST = #{post} </if>" +
             " <if test=\"department != null\"> , BU_DEPARTMENT = #{department} </if>" +
+            " <if test=\"role != null\"> , BU_ROLE = #{role} </if>" +
             " ,updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss')" +
             "  where bu_id = #{id}" +
             " </script>")

src/main/java/com/server/user/UserService.java

@@ -80,6 +80,14 @@ public class UserService {
         return new RepEntity(RepCode.success, tokenData);
     }
 
+    /*
+    更新用户信息
+     */
+    public RepEntity updateUser(User user){
+        userMapper.updateUser(user);
+        return new RepEntity(RepCode.success);
+    }
+
 
     public RepEntity login1(LoginInfo loginInfo){
         String userName = loginInfo.getUserName();

src/main/java/com/util/ContextUtil.java

@@ -28,7 +28,7 @@ public class ContextUtil {
 
 	/**
 	 * 获取bean
-	 * 
+	 *
 	 * @param name
 	 * @return
 	 */
@@ -38,12 +38,12 @@ public class ContextUtil {
 		} catch (Exception e) {
 			return null;
 		}
-		
+
 	}
 
 	/**
 	 * 获取bean
-	 * 
+	 *
 	 * @param cls
 	 * @return
 	 */
@@ -54,7 +54,7 @@ public class ContextUtil {
 
 	/**
 	 * 触发事件
-	 * 
+	 *
 	 * @param event
 	 */
 	public static void publishEvent(ApplicationEvent event) {