Merge branch 'h5' of http://git.ycjcjy.com/civilized_city/service into h5

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.21</version>
+    <version>0.0.23</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>

src/main/java/com/example/civilizedcity/common/BaseController.java

@@ -43,20 +43,20 @@ public class BaseController {
         return user;
     }
 
-//    public TaPerson currentPerson() throws Exception {
-//
-//        String personId = request.getHeader("x-personId");
-//        if (StringUtils.isEmpty(personId)) {
-//            return null;
-//        }
-//
-//        TaPerson taPerson = taPersonService.getById(personId);
-//        if (taPerson == null || taPerson.getStatus() == Constants.STATUS_DELETE) {
-//            return null;
-//        }
-//
-//        return taPerson;
-//    }
+    public TaPerson currentPerson() throws Exception {
+
+        String personId = request.getHeader("x-personId");
+        if (StringUtils.isEmpty(personId)) {
+            return null;
+        }
+
+        TaPerson taPerson = taPersonService.getById(personId);
+        if (taPerson == null || taPerson.getStatus() == Constants.STATUS_DELETE) {
+            return null;
+        }
+
+        return taPerson;
+    }
 
     public String getPersonDuty() throws Exception {
         String duty = request.getHeader("x-duty");

src/main/java/com/example/civilizedcity/controller/CommController.java

@@ -1,6 +1,8 @@
 package com.example.civilizedcity.controller;
 
 
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.io.FileUtil;
 import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.OSSUtils;
 import com.example.civilizedcity.common.ResponseBean;
@@ -71,6 +73,45 @@ public class CommController extends BaseController {
         }});
     }
 
+
+    /**
+     * 文件
+     * @param base64
+     * @return
+     */
+    @ApiOperation(value = "文件上传", notes = "文件上传")
+    @PostMapping("/{client}/file/base64")
+    public ResponseBean uploadImageBase64(@ApiParam("客户端") @PathVariable String client,
+                                    @ApiParam("文件") @RequestParam("base64") String base64,
+                                          @ApiParam("文件名称") @RequestParam("fileName") String fileName,
+                                    @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) throws Exception {
+
+        String base64Str = base64;
+        // 去除Base64字符串的前缀（如果有）
+        if (base64Str.startsWith("data:")) {
+            base64Str = base64Str.substring(base64Str.indexOf("base64,") + 7);
+        }
+
+        // 解码Base64字符串并写入文件
+        byte[] decodedBytes = Base64.decode(base64Str);
+        //获取文件名
+        String fName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
+
+        // 上传目录以日期分类
+        String upPath = getUploadPath();
+        File tmp = new File(String.format("%s/%s", upPath, getMonth()));
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        FileUtil.writeBytes(decodedBytes, FileUtil.file(upPath + "/" + fName));
+        String url = String.format("%s/%s", uploadPrefix, fName);
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("url", url);
+            put("fileType", fileType);
+        }});
+    }
+
     private String getUploadPath() {
         File tmp = new File(uploadPath);
         if (!tmp.exists()) {

src/main/java/com/example/civilizedcity/controller/WxMaController.java

@@ -111,6 +111,41 @@ public class WxMaController extends BaseController {
         return ResponseBean.success(res);
     }
 
+
+
+    /**
+     * 小程序
+     *
+     * @param taPerson
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/signup")
+    @ApiOperation(value = "用户注册", notes = "用户注册", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean signup(@ApiParam("登录参数") @RequestBody TaPerson taPerson) throws Exception {
+        if (StringUtils.isEmpty(taPerson.getOpenid())) {
+            return ResponseBean.error("注册用户失败, 请退出重试");
+        }
+
+        TaPerson origin = taPersonService.getByOpenId(taPerson.getOpenid());
+        if (null == origin) {
+            taPerson.setStatus(Constants.STATUS_NORMAL);
+            taPerson.setCreateDate(LocalDateTime.now());
+            taPersonService.save(taPerson);
+
+            return ResponseBean.success(taPerson);
+        } else {
+            taPerson.setPersonId(origin.getPersonId());
+            taPersonService.updateById(taPerson);
+        }
+
+        // 获取最新的数据
+        taPerson = taPersonService.getById(taPerson.getPersonId());
+
+        Map<String, Object> res = sysLoginService.loginByPerson(taPerson);
+        return ResponseBean.success(res);
+    }
+
     /**
      * 系统人员登录
      *
@@ -130,11 +165,17 @@ public class WxMaController extends BaseController {
         List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
         user.setDutyList(dutyList);
 
+        TaPerson taPerson = null;
+        if (StringUtils.isNotEmpty(user.getPhone())) {
+            taPerson = taPersonService.getExistBy("phone", user.getPhone(), false, true);
+        }
+
         // 登录新用户
         StpUtil.login(user.getUserId(), "miniapp");
 
         Map<String, Object> res = new HashMap<>();
         res.put("user", user);
+        res.put("person", taPerson);
         res.put("token", StpUtil.getTokenValue());
 
         return ResponseBean.success(res);
@@ -153,11 +194,17 @@ public class WxMaController extends BaseController {
         List<String> dutyList = sysUserDutyService.getListByUser(user.getUserId());
         user.setDutyList(dutyList);
 
+        TaPerson taPerson = null;
+        if (StringUtils.isNotEmpty(user.getPhone())) {
+            taPerson = taPersonService.getExistBy("phone", user.getPhone(), false, true);
+        }
+
         // 登录新用户
         StpUtil.login(user.getUserId(), "miniapp");
 
         Map<String, Object> res = new HashMap<>();
         res.put("user", user);
+        res.put("person", taPerson);
         res.put("token", StpUtil.getTokenValue());
 
         return ResponseBean.success(res);
@@ -191,15 +238,15 @@ public class WxMaController extends BaseController {
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = wxMaUitl.getPhoneNoInfo(code);
 
-        SysUser sysUser = currentUser();
-        if (null == sysUser) {
+        TaPerson taPerson = currentPerson();
+        if (null == taPerson) {
             throw new Exception("校验当前人员失败, 请重试");
         }
 
-        sysUser.setPhone(phoneNoInfo.getPhoneNumber());
-        sysUserService.updateById(sysUser);
+        taPerson.setPhone(phoneNoInfo.getPhoneNumber());
+        taPersonService.updateById(taPerson);
 
-        Map<String, Object> res = sysLoginService.loginByPerson(sysUser);
+        Map<String, Object> res = sysLoginService.loginByPerson(taPerson);
 
         return ResponseBean.success(res);
     }

src/main/java/com/example/civilizedcity/service/SysLoginService.java

@@ -17,7 +17,7 @@ public interface SysLoginService extends IBaseService<SysLogin> {
 
      boolean changePassword(SysUser user, WxChangePwd wxChangePwd);
 
-    Map<String, Object> loginByPerson(SysUser sysUser);
+    Map<String, Object> loginByPerson(TaPerson taPerson);
 
     void removeByUser(String userId);
 }

src/main/java/com/example/civilizedcity/service/impl/SysLoginServiceImpl.java

@@ -46,16 +46,16 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
     }
 
     @Override
-    public Map<String, Object> loginByPerson(SysUser sysUser) {
+    public Map<String, Object> loginByPerson(TaPerson taPerson) {
         Map<String, Object> res = new HashMap<>();
         SysUser user = null;
 
-                List<SysUser> sysUserList = sysUserMapper.getListByPhone(sysUser.getPhone());
+                List<SysUser> sysUserList = sysUserMapper.getListByPhone(taPerson.getPhone());
         if (null == sysUserList || sysUserList.size() < 1) {
             user = new SysUser();
-            user.setPhone(sysUser.getPhone());
+            user.setPhone(taPerson.getPhone());
             user.setIsUser(false);
-            user.setOrgId(sysUser.getUserId()); // 机构ID 使用用户ID , 目前没有使用到
+            user.setOrgId(taPerson.getPersonId()); // 机构ID 使用用户ID , 目前没有使用到
             user.setStatus(Constants.STATUS_NORMAL);
             user.setCreateDate(LocalDateTime.now());
             sysUserMapper.insert(user);
@@ -80,7 +80,7 @@ public class SysLoginServiceImpl extends BaseServiceImpl<SysLoginMapper, SysLogi
         // 登录新用户
         StpUtil.login(user.getUserId(), "miniapp");
         res.put("user", user);
-        res.put("user", sysUser);
+        res.put("person", taPerson);
         res.put("token", StpUtil.getTokenValue());
 
         return res;

src/main/resources/application-prod.yml

@@ -37,6 +37,7 @@ yz:
       - "/static/**"
       - "/**/login"
       - "/**/signin"
+      - "/**/signup"
       - "/ma/captcha"
       - "/ma/change-password"
       - "/ma/auth-phone"

src/main/resources/application.yml

@@ -21,7 +21,7 @@ message:
     httpUrl: http://api.smsbao.com/sms
     userName: pzhgd
     password: PZHdt@147293ac
-    template: 【文明创城办】%s，您有一条工作待办请前往{XXXAPP}及时处理
+    template: 【文明创城办】%s，您有一条工作待办，请及时处理
 
 ###
 sms:
@@ -39,6 +39,7 @@ yz:
       - "/static/**"
       - "/**/login"
       - "/**/signin"
+      - "/**/signup"
       - "/ma/captcha"
       - "/ma/change-password"
       - "/ma/auth-phone"