注册与主服务交互功能

willalp-admin/src/main/java/com/willalp/WillalpApplication.java

@@ -33,11 +33,11 @@ public class WillalpApplication extends SpringBootServletInitializer implements
 
     public static void main(String[] args) {
         SpringApplication.run(WillalpApplication.class, args);
-        logger.info("\n" +
-                "| |     / /  /   /  / /     / /     /   |    / /     / __ \\\n"
-                + "| | /| / /   / /   / /     / /     / /| |   / /     / /_/ /\n"
-                + "| |/ |/ /   / /   / /_ _  / /_ _  / /_| |  / /_ _  / _ _ / \n"
-                + "| /  | /  /   /  /     / /     / / /  | | /     / / /");
+        logger.info(" &&&&&&&&&&&&&&&&&&&&&& 会助理 - 梅陇 &&&&&&&&&&&&&&&&&&&&&& \n" +
+                "__ |     / /  /_ _/  / /      / /     /   |    / /      / __ \\\n"
+                + "__ | /| / /   / /   / /      / /     / /| |   / /      / /_/ /\n"
+                + "__ |/ |/ /   / /   / /____  / /___  / /_| |  / /____  / ____/ \n"
+                + "____/|__/  /___/  /______/ /_____/ /_/  |_| /______/ /_/");
     }
 
     @Override

willalp-admin/src/main/java/com/willalp/web/controller/api/ApiOneController.java

@@ -0,0 +1,49 @@
+package com.willalp.web.controller.api;
+
+import com.willalp.common.core.domain.AjaxResult;
+import com.willalp.common.core.domain.entity.SysUser;
+import com.willalp.common.enums.SysOrgCodeEnum;
+import com.willalp.common.utils.SecurityUtils;
+import com.willalp.files.domain.HsOrgPersonnelFiles;
+import com.willalp.files.service.IHsOrgPersonnelFilesService;
+import com.willalp.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.net.URLDecoder;
+
+
+@Api("api外部接口")
+@RestController
+@RequestMapping("/api")
+public class ApiOneController {
+
+    @Resource
+    private ISysUserService userService;
+
+    @Resource
+    private IHsOrgPersonnelFilesService orgPersonnelFilesService;
+
+    @RequestMapping("/add")
+    public AjaxResult add(@RequestBody SysUser user) {
+        try {
+            user.setNickName(
+                    URLDecoder.decode(user.getNickName(), "utf8"));
+            user.setCreateBy("app");
+            user.setUserType("1");
+            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+            HsOrgPersonnelFiles opf = new HsOrgPersonnelFiles();
+            opf.setUserCode(user.getUserName());
+            opf.setPhone(user.getPhonenumber());
+            opf.setOrgCode(SysOrgCodeEnum.MLHuiZhuLi.getCode());
+            orgPersonnelFilesService.save(opf);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+        return AjaxResult.success(userService.insertUser(user));
+    }
+}

willalp-admin/src/main/java/com/willalp/web/controller/app/AppController.java

@@ -589,7 +589,7 @@ public class AppController extends BaseController {
 
     @RequestMapping("/add")
     @ResponseBody
-    public AjaxResult add(SysUser user) {
+    public AjaxResult add(@RequestBody SysUser user) {
 //        if (StringUtils.isNotEmpty(user.getPhonenumber())
 //                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
 //            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
@@ -603,7 +603,7 @@ public class AppController extends BaseController {
         HsOrgPersonnelFiles opf = new HsOrgPersonnelFiles();
         opf.setUserCode(user.getUserName());
         opf.setPhone(user.getPhonenumber());
-        opf.setOrgCode(user.getOrganizationCode());
+        opf.setOrgCode("G00000007");
         orgPersonnelFilesService.save(opf);
         return AjaxResult.success(userService.insertUser(user));
     }

willalp-admin/src/main/resources/logback.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/home/willalp/logs"/>
+    <property name="log.path" value="/hs/output/willalp-pns-ml"/>
     <!-- 日志名称 -->
     <property name="log.name" value="hs_pns_log"/>
     <!-- 日志输出格式 -->
     <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
     <property name="CONSOLE_LOG_PATTERN"
-              value="%date{HH:mm:ss} | %highlight(%-5level) | %boldYellow(%thread) - %msg%n"/>
+              value="%highlight(%date{yyyy-MM-dd HH:mm:ss.SSS}) %cyan([%thread]) %yellow(%-5level) %green(%logger{36}).%boldMagenta(%line) - %blue(%msg%n)"/>
     <!--value="%date{yyyy-MM-dd HH:mm:ss}|%highlight(%-5level)|%boldYellow(%thread)|%boldGreen(%logger)|%msg%n"/>-->
 
     <!-- 活动文件的大小 -->

willalp-common/src/main/java/com/willalp/common/enums/SysOrgCodeEnum.java

@@ -0,0 +1,33 @@
+package com.willalp.common.enums;
+
+/**
+ * 系统机构编码枚举类
+ */
+public enum SysOrgCodeEnum {
+    HuiJiFen("G00000003", "会积分"),
+    MLHuiZhuLi("G00000007", "梅陇社区卫生服务中心");
+
+    private String code;
+    private String name;
+
+    SysOrgCodeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

willalp-system/src/main/java/com/willalp/system/service/impl/SysUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.willalp.common.core.domain.entity.SysRole;
 import com.willalp.common.core.domain.entity.SysUser;
 import com.willalp.common.core.domain.request.SysUserExport;
 import com.willalp.common.enums.NumberRuleEnum;
+import com.willalp.common.enums.SysOrgCodeEnum;
 import com.willalp.common.exception.ServiceException;
 import com.willalp.common.exception.base.BaseException;
 import com.willalp.common.utils.DateUtils;
@@ -278,7 +279,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserOrganization hs = new SysUserOrganization();
         hs.setIsDefault(1);
         hs.setLoginName(code);
-        hs.setOrganizationCode("G00000003");
+        hs.setOrganizationCode(SysOrgCodeEnum.HuiJiFen.getCode());
         hs.setEffectiveDate(DateUtils.addYears(new Date(), 50));
         sysUserOrganizationMapper.insert(hs);
         user.setUserName(code);