11

chuanyi_server/src/main/java/com/judong/chuanyiserver/config/OpcServerDaPoolFactory.java

@@ -158,9 +158,9 @@ public class OpcServerDaPoolFactory {
             // 使用Stoner Simulation Server的配置
 //             ci.setClsid("83BFA400-BC06-11d4-AEC4-00902760973D"); // MatrikonOPC的注册表ID，可以在“组件服务”里看到
             // 使用KepOPC Server的配置
-//            ci.setClsid("7BC0CC8E-482C-47CA-ABDC-0FE7F9C6E729"); // KEPServer的注册表ID，可以在“组件服务”里看到
+            ci.setClsid("7BC0CC8E-482C-47CA-ABDC-0FE7F9C6E729"); // KEPServer的注册表ID，可以在“组件服务”里看到
             // 使用King OPC Server的配置
-            ci.setClsid("20667E7E-A3EF-422F-AEDD-890D23746358"); // KEPServer的注册表ID，可以在“组件服务”里看到
+//            ci.setClsid("20667E7E-A3EF-422F-AEDD-890D23746358"); // KEPServer的注册表ID，可以在“组件服务”里看到
             Server server = new Server(ci, Executors.newSingleThreadScheduledExecutor());
             log.info("声明一个对象完成:" + server);
             try {

chuanyi_server/src/main/java/com/judong/chuanyiserver/enums/ResultEnum.java

@@ -5,10 +5,10 @@ public enum ResultEnum {
     SUCCESS(200, "成功"),
 
     REQUEST_WRONGPARAMS(400, "参数错误"),
-    UNAUTHORIZED(401, "未通过token验证"),
+    LOGIN_EXPIRED(401, "登录信息过期，请重新登录"),
     NO_OPERATION_AUTHORITY(402, "无操作权限"),
+    UNAUTHORIZED(403, "未通过token验证"),
     NOT_FOUND(404, "不存在"),
-    LOGIN_EXPIRED(405, "登录信息过期，请重新登录"),
     REQUEST_TIME_OUT(408, "请求超时"),
 
     SERVER_ERROR(500, "服务器出现异常"),

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserServiceImpl.java

@@ -99,12 +99,14 @@ public class UserServiceImpl implements UserService {
         json.put("user", isExistUser);
         List<Integer> roleIdList = userDao.getRoleIdListByUserId(isExistUser.getUserId());
         if (Blank.isEmpty(roleIdList)) {
-            return Result.no(ResultEnum.NO_OPERATION_AUTHORITY.getRespCode(), "没有角色信息");
+            json.put("roleIdList", "");
+            return Result.ok("没有角色信息");
         }
         json.put("roleIdList", roleIdList);
         List<Permission> permissionList = userDao.getPermissionByRoleList(roleIdList);
         if (Blank.isEmpty(permissionList)) {
-            return Result.no(ResultEnum.NO_OPERATION_AUTHORITY.getRespCode(), "没有权限信息");
+            json.put("permissionList", "");
+            return Result.ok("没有权限信息");
         }
         json.put("permissionList", permissionList);
         //生成token

chuanyi_server/src/main/java/com/judong/chuanyiserver/util/OpcServerDaUtil.java

@@ -153,6 +153,9 @@ public class OpcServerDaUtil {
         //获取服务器下所有ITEM列表,树形展示
         TreeBrowser treeBrowser = server.getTreeBrowser();
         Branch browse = treeBrowser.browse();
+        if (Blank.isEmpty(browse)) {
+            return null;
+        }
         Collection<Branch> branches = browse.getBranches();
         for (Branch branch : branches) {
 //            Collection<Leaf> leaves = branch.getLeaves();