Crystal.Sea пре 4 година
родитељ
комит
88128bec08

+ 21 - 0
maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java

@@ -35,6 +35,7 @@ import org.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +48,7 @@ import org.springframework.stereotype.Service;
 public class UserInfoService extends JpaBaseService<UserInfo> {
 	final static Logger _logger = LoggerFactory.getLogger(UserInfoService.class);
 	
+	final static  String UPDATE_GRIDLIST_SQL = "UPDATE MXK_USERINFO SET GRIDLIST = ? WHERE ID = ?";
 	@Autowired
 	private PasswordEncoder passwordEncoder;
 	
@@ -56,6 +58,9 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 	@Autowired
 	KafkaProvisioningService kafkaProvisioningService;
 	
+	 @Autowired
+	 protected JdbcTemplate jdbcTemplate;
+	
 	public UserInfoService() {
 		super(UserInfoMapper.class);
 	}
@@ -107,6 +112,22 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 		return false;
 	}
 
+	public boolean updateGridList(String gridList) {
+	    try {
+    	    if (gridList != null && !gridList.equals("")) {
+                int intGridList = Integer.parseInt(gridList);
+                jdbcTemplate.update(UPDATE_GRIDLIST_SQL, intGridList,
+                        WebContext.getUserInfo().getId());
+                WebContext.getUserInfo().setGridList(intGridList);
+            }
+	    }catch(Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+	    return true;
+	}
+	
+	
 	public boolean updateProtectedApps(UserInfo userinfo) {
 		try {
 			if(WebContext.getUserInfo() != null) {

+ 1 - 11
maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java

@@ -34,7 +34,6 @@ import org.maxkey.web.message.MessageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -56,9 +55,6 @@ public class AppListController {
     private UserInfoService userInfoService;
 
     @Autowired
-    protected JdbcTemplate jdbcTemplate;
-
-    @Autowired
     AccountsService appUsersService;
 
     @Autowired
@@ -73,13 +69,7 @@ public class AppListController {
     public ModelAndView appList(
             @RequestParam(value = "gridList", required = false) String gridList) {
         ModelAndView modelAndView = new ModelAndView("main/appList");
-
-        if (gridList != null && !gridList.equals("")) {
-            int intGridList = Integer.parseInt(gridList);
-            jdbcTemplate.update("UPDATE MXK_USERINFO SET GRIDLIST = ? WHERE ID = ?", intGridList,
-                    WebContext.getUserInfo().getId());
-            WebContext.getUserInfo().setGridList(intGridList);
-        }
+        userInfoService.updateGridList(gridList);
         modelAndView.addObject("appList", queryAccessableApps());
         return modelAndView;
     }