去除同步website接口

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -91,10 +91,10 @@ public class UserspaceManagerController extends BaseController {
     /**
      * 校验企业是否被认证
      *
-     * @author wangmh
-     * @date 2018/1/11 20:51
      * @param spaceName 企业名称
      * @return
+     * @author wangmh
+     * @date 2018/1/11 20:51
      */
     @RequestMapping(value = "/name/valid", method = RequestMethod.GET)
     public ModelMap spaceNameIsValid(String spaceName) {
@@ -104,10 +104,10 @@ public class UserspaceManagerController extends BaseController {
     /**
      * 校验营业执照号是否被认证
      *
-     * @author wangmh
-     * @date 2018/1/11 10:35
      * @param businessCode 营业执照号
      * @return
+     * @author wangmh
+     * @date 2018/1/11 10:35
      */
     @RequestMapping(value = "/businessCode/valid", method = RequestMethod.GET)
     public ModelMap businessCodeIsValid(String businessCode) {
@@ -116,6 +116,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 上传营业执照号
+     *
      * @param image 营业执照号
      * @return 图片地址
      * @throws Exception
@@ -141,8 +142,9 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 模糊搜索企业名称
+     *
      * @param keyword 关键字
-     * @param number 获取数量
+     * @param number  获取数量
      * @return page对象
      */
     @RequestMapping(value = "/search/name", method = RequestMethod.GET)
@@ -155,6 +157,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 根据企业名称查询企业
+     *
      * @param name 企业名称
      * @return 企业信息
      */
@@ -168,6 +171,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 根据企业名称查询企业
+     *
      * @param businessCode 企业营业执照号
      * @return 企业信息
      */
@@ -181,6 +185,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 根据企业名称查询企业
+     *
      * @param spaceUU 企业营业执照号
      * @return 企业信息
      */
@@ -202,6 +207,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 统计申请已审批和未审批数量
+     *
      * @param spaceUU 企业uu号
      * @return
      */
@@ -212,8 +218,9 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 企业解除绑定应用
+     *
      * @param spaceUU 企业uu号
-     * @param appId 应用id
+     * @param appId   应用id
      * @return
      */
     @RequestMapping(params = "_operate=unbind", method = RequestMethod.POST)
@@ -228,8 +235,9 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 企业开通应用
+     *
      * @param spaceUU 企业uu号
-     * @param appId 应用id
+     * @param appId   应用id
      * @return
      */
     @RequestMapping(params = "_operate=bind", method = RequestMethod.POST)
@@ -350,12 +358,13 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 同步旧企业数据到账户中心
+     *
      * @param spaceUU 企业uu号，为空则同步所有
      * @return
      */
     @RequestMapping("/saveOldUserSpaces/{spaceUU}")
     public ModelMap syncOldUserSpaces(@PathVariable Long spaceUU, @RequestParam(defaultValue = "1") int pageNumber,
-                                      @RequestParam(defaultValue = "20")int pageSize, @RequestParam(defaultValue = "false") boolean isAll) {
+                                      @RequestParam(defaultValue = "20") int pageSize, @RequestParam(defaultValue = "false") boolean isAll) {
         // 由于旧数据问题，记录重复的企业名称和营业执照号
         Map<String, Integer> repeatSpaceName = new HashMap<>();
         Map<String, Integer> repeatBusinessCode = new HashMap<>();
@@ -444,9 +453,9 @@ public class UserspaceManagerController extends BaseController {
             ResultWrap result = JSON.parseObject(res.getContent(), ResultWrap.class);
             if (!result.isSuccess()) {
                 throw new Exception(result.getErrMsg());
-            } else if (result.getContent() != null){
+            } else if (result.getContent() != null) {
                 List<UserSpace> userSpaceList = JSON.parseArray(result.getContent().toString(), UserSpace.class);
-                for (int i=0; i<userSpaceList.size(); i++) {
+                for (int i = 0; i < userSpaceList.size(); i++) {
                     App app = appService.findOne(userSpaceList.get(i).getAppId());
                     if (app != null && !userspace.getApps().contains(app)) {
                         userspace.getApps().add(app);
@@ -483,7 +492,8 @@ public class UserspaceManagerController extends BaseController {
             if (!res.isSuccess()) {
                 throw new Exception(res.getContent());
             } else {
-                page = JSON.parseObject(res.getContent(), new TypeReference<com.uas.sso.support.Page<com.uas.account.entity.User>>() {});
+                page = JSON.parseObject(res.getContent(), new TypeReference<com.uas.sso.support.Page<com.uas.account.entity.User>>() {
+                });
                 List<com.uas.account.entity.User> users = page.getContent();
                 for (int i = 0; i < users.size(); i++) {
                     User user = users.get(i).getDialectUID() == null ? userService.findByMobile(users.get(i).getUid()) : userService.findOne(Long.valueOf(users.get(i).getDialectUID()));
@@ -513,7 +523,7 @@ public class UserspaceManagerController extends BaseController {
         data.put("businessCode", businessCode);
         data.put("name", name);
         res = HttpUtil.doGet(url, data);
-        if(res.isSuccess() && !StringUtils.isEmpty(res.getContent())) {
+        if (res.isSuccess() && !StringUtils.isEmpty(res.getContent())) {
             JSONObject jsonObject = JSON.parseObject(res.getContent());
             if (jsonObject.containsKey("dialectUID")) {
                 return Long.valueOf(jsonObject.get("dialectUID").toString());
@@ -525,15 +535,16 @@ public class UserspaceManagerController extends BaseController {
     public com.uas.sso.support.Page<UserSpaceDetail> getUserSpace(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
         com.uas.sso.support.Page<UserSpaceDetail> page = null;
         String url = "http://10.1.51.50:8080/api/partners";
-        if(!StringUtils.isEmpty(url)) {
+        if (!StringUtils.isEmpty(url)) {
             HttpUtil.ResponseWrap res = null;
             try {
                 ModelMap data = new ModelMap("_operate", "getUserSpaces");
                 data.put("pageNumber", Integer.valueOf(pageNumber));
                 data.put("pageSize", Integer.valueOf(pageSize));
                 res = HttpUtil.doGet(url, data);
-                if(res.isSuccess()) {
-                    return JSON.parseObject(res.getContent(), new TypeReference<com.uas.sso.support.Page<UserSpaceDetail>>() {});
+                if (res.isSuccess()) {
+                    return JSON.parseObject(res.getContent(), new TypeReference<com.uas.sso.support.Page<UserSpaceDetail>>() {
+                    });
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -544,6 +555,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 从b2b获取erp企业秘钥
+     *
      * @return
      */
     @RequestMapping(value = "/saveAccessSecret/{businessCode}")
@@ -556,6 +568,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 从b2b获取密钥
+     *
      * @param businessCode 营业执照号
      * @return
      */
@@ -577,6 +590,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 写入日志
+     *
      * @param businessCode 营业执照号
      * @param accessSecret 密钥
      */
@@ -584,7 +598,7 @@ public class UserspaceManagerController extends BaseController {
         FileWriter fw = null;
         try {
             //如果文件存在，则追加内容；如果文件不存在，则创建文件
-            File f=new File("logs/userspace.log");
+            File f = new File("logs/userspace.log");
             fw = new FileWriter(f, true);
         } catch (IOException e) {
             e.printStackTrace();
@@ -606,7 +620,7 @@ public class UserspaceManagerController extends BaseController {
         List<String> repeatName = userspaceService.findRepeatName();
         for (String name : repeatName) {
             List<Userspace> userspaces = userspaceService.findAllBySpaceName(name);
-            for (int i=0; i<userspaces.size(); i++) {
+            for (int i = 0; i < userspaces.size(); i++) {
                 Userspace userspace = userspaces.get(i);
                 userspace.setSpaceName(userspace.getSpaceName() + Const.REPEAT_SEPARATOR + (i + 1));
                 userspaceService.save(userspace);
@@ -617,6 +631,7 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 从其他应用注册企业信息
+     *
      * @param userspace 企业信息
      */
     @RequestMapping(value = "/register/other", method = RequestMethod.POST)
@@ -639,105 +654,4 @@ public class UserspaceManagerController extends BaseController {
     public List<Userspace> findAll(String ids) {
         return userspaceService.findAll(ids);
     }
-
-    @RequestMapping("/getWebsite")
-    public String getWebsite() {
-        String url = "http://10.1.51.50:8080/api/userspace/getWebsite";
-        int pageNumber = 3;
-        int pageSize = 20;
-        com.uas.account.support.Page<MasterInfo> page = null;
-        do {
-            try {
-                ModelMap data = new ModelMap();
-                data.put("pageNumber", pageNumber++);
-                data.put("pageSize", pageSize);
-                HttpUtil.ResponseWrap responseWrap = HttpUtil.doGet(url, data);
-                if (responseWrap.isSuccess()) {
-                    try {
-                        page = JSON.parseObject(responseWrap.getContent(), new TypeReference<com.uas.account.support.Page<MasterInfo>>() {
-                        });
-                        for (MasterInfo masterInfo : page.getContent()) {
-                            try {
-                                Userspace userspace = userspaceService.findByBusinessCode(masterInfo.getBusinessCode());
-                                if (userspace == null) {
-                                    userspace = userspaceService.findBySpaceName(masterInfo.getName());
-                                }
-                                if (userspace == null && !StringUtils.isEmpty(masterInfo.getUu())) {
-                                    userspace = userspaceService.findOne(Long.valueOf(masterInfo.getUu()));
-                                }
-                                if (userspace != null && masterInfo.getWebsite() != null) {
-                                    userspace.setWebsite(masterInfo.getWebsite());
-                                    userspaceService.save(userspace);
-                                }
-
-                                if (userspace == null && !StringUtils.isEmpty(masterInfo.getPlatform())) {
-                                    userspace = new Userspace();
-                                    userspace.setSpaceName(masterInfo.getName());
-                                    userspace.setBusinessCode(masterInfo.getBusinessCode());
-                                    userspace.setValidCode((short) Status.NOT_APPLYING.getCode());
-                                    userspace.setWebsite(masterInfo.getWebsite());
-                                    // 设置uu号
-                                    Long maxUU = userspaceDao.findMaxUU();
-                                    userspace.setSpaceUU(maxUU < 10050000L ? 10050000L : (maxUU + 1));
-                                    userspace.setApps(new ArrayList<App>());
-                                    userspace.getApps().add(appService.findOne(masterInfo.getPlatform()));
-                                    userspace = userspaceService.save(userspace);
-                                    System.out.println(String.format("%s\t%s\t%s", userspace.getSpaceName(), userspace.getBusinessCode(), userspace.getSpaceUU()));
-                                }
-                                if (CollectionUtils.isEmpty(userspace.getUsers())) {
-                                    userspace.setUsers(new ArrayList<User>());
-                                }
-                                if (!StringUtils.isEmpty(masterInfo.getUu())) {
-                                    continue;
-                                }
-                                com.uas.account.support.Page<com.uas.account.entity.User> userInfos = null;
-                                int pageNumber2 = 1;
-                                int pageSize2 = 20;
-                                do {
-                                    userInfos = AccountUtils.findUsersByBusinessCode(userspace.getBusinessCode(), pageNumber2++, pageSize2);
-                                    for (com.uas.account.entity.User userInfo : userInfos.getContent()) {
-                                        try {
-                                            User user = userService.findByMobile(userInfo.getUid());
-                                            if (!userInfo.getAppId().equals("b2b") && !userspace.getUsers().contains(user)) {
-                                                userspace.getUsers().add(user);
-                                            }
-                                        } catch (Exception e) {
-                                            System.out.println(userInfo.getName() + "\t" + userInfo.getUid() + "\t" + e.getMessage());
-                                        }
-                                    }
-                                } while (userInfos == null || !userInfos.isLast());
-                                userspace = userspaceService.save(userspace);
-                            } catch (Exception e) {
-                                System.out.println((pageNumber-1) + "\t" + masterInfo.getName() + "\t" +e.getMessage());
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } while (page == null || !page.isLast());
-        return null;
-    }
-
-    @RequestMapping("/delete")
-    public ModelMap delete() {
-        List<Userspace> userspaces = userspaceDao.findtest();
-        userspaceDao.delete(userspaces);
-        return success();
-    }
-
-    @RequestMapping("/update")
-    public ModelMap update () {
-        Userspace userspace = userspaceDao.findOne(20000012L);
-        userspace.setSpaceUU(10050072L);
-        userspaceDao.save(userspace);
-
-        userspace = userspaceDao.findOne(20000013L);
-        userspace.setSpaceUU(10050073L);
-        userspaceDao.save(userspace);
-        return success();
-    }
 }