Merge remote-tracking branch 'origin/dev' into feature-weixinLogin-wangmh

sso-server/src/main/java/com/uas/sso/erp/controller/ErpUserManagerController.java

@@ -0,0 +1,56 @@
+package com.uas.sso.erp.controller;
+
+import com.alibaba.dubbo.common.utils.Assert;
+import com.uas.sso.entity.User;
+import com.uas.sso.entity.UserLog;
+import com.uas.sso.logging.Logger;
+import com.uas.sso.logging.LoggerManager;
+import com.uas.sso.logging.UserBufferedLogger;
+import com.uas.sso.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangmh
+ * @create 2018-07-03 15:38
+ * @desc 用户管理接口（erp接口）
+ **/
+@RestController
+@RequestMapping("/api/user/erp")
+public class ErpUserManagerController extends ErpBaseController {
+
+    @Autowired
+    private UserService userService;
+
+    UserBufferedLogger userLog = LoggerManager.getLogger(UserBufferedLogger.class);
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public ModelMap updateUserInfo(@RequestParam(defaultValue = "uas") String appId, User user) {
+        Assert.notNull(user, "用户信息不能为空");
+        Assert.notNull(user.getUserUU(), "用户uu号不能为空");
+
+        User oldUser = userService.findOne(user.getUserUU());
+
+        StringBuffer sb = new StringBuffer();
+        sb.append("update ");
+        // 修改用户名
+        if (!StringUtils.isEmpty(user.getVipName())) {
+            oldUser.setVipName(user.getVipName());
+            sb.append("name ");
+        }
+        // 修改性别
+        if (!StringUtils.isEmpty(user.getSex())) {
+            oldUser.setSex(user.getSex());
+            sb.append("sex ");
+        }
+        userService.save(oldUser);
+        userLog.info(oldUser, sb.toString());
+
+        return success(oldUser);
+    }
+}