F

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/StatController.java

@@ -43,10 +43,10 @@ public class StatController extends BaseController {
             //
         }
 
-        person = currentPerson();
-        if (null == person) {
-            return ResponseBean.error("请在小程序端操作");
-        }
+//        person = currentPerson();
+//        if (null == person) {
+//            return ResponseBean.error("请在小程序端操作");
+//        }
 
         List<StatVo> result = taIssueService.statMaIndex(user, person, duty);
 

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

@@ -9,16 +9,13 @@ import com.example.civilizedcity.common.ResponseBean;
 import java.util.List;
 
 import com.example.civilizedcity.common.StringUtils;
-import com.example.civilizedcity.entity.TaAttach;
-import com.example.civilizedcity.entity.TaIssue;
-import com.example.civilizedcity.entity.TaPerson;
+import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.service.TaAttachService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.example.civilizedcity.entity.TaFeedback;
 import com.example.civilizedcity.service.TaFeedbackService;
 
  /**
@@ -66,12 +63,12 @@ public class TaFeedbackController extends BaseController {
                              @ApiParam("我的") @RequestParam(value ="isMine", defaultValue = "false") Boolean isMine,
                              @ApiParam("问题单状态") @RequestParam(value = "bizStatus", required = false) String bizStatus) throws Exception {
 
-        TaPerson taPerson = currentPerson();
-        if (null == taPerson && isMine) {
+        SysUser sysUser = currentUser();
+        if (null == sysUser && isMine) {
             return ResponseBean.error("请在小程序中操作");
         }
 
-        String personId = isMine ? taPerson.getPersonId() : null;
+        String personId = isMine ? sysUser.getUserId() : null;
         
         IPage<TaIssue> pg = new Page<>(pageNum, pageSize);
         IPage<TaIssue> result = taFeedbackService.getPageBy(pg, personId, bizStatus);
@@ -100,9 +97,9 @@ public class TaFeedbackController extends BaseController {
             return ResponseBean.error("请上传照片");
         }
 
-        TaPerson taPerson = currentPerson();
+        SysUser sysUser = currentUser();
 
-        taFeedbackService.createNew(taFeedback, taPerson);
+        taFeedbackService.createNew(taFeedback, sysUser);
         return ResponseBean.success(taFeedback);
     }
     
@@ -129,8 +126,8 @@ public class TaFeedbackController extends BaseController {
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taFeedback/{id}")
     public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        TaPerson taPerson = currentPerson();
-        if (null == taPerson) {
+        SysUser sysUser = currentUser();
+        if (null == sysUser) {
             return ResponseBean.error("请在小程序中操作");
         }
 
@@ -139,7 +136,7 @@ public class TaFeedbackController extends BaseController {
             return ResponseBean.error("未找到相关数据");
         }
 
-        if (!taPerson.getPersonId().equals(taFeedback.getPersonId())) {
+        if (!sysUser.getUserId().equals(taFeedback.getPersonId())) {
             return ResponseBean.error("暂无权限");
         }
 

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

@@ -13,6 +13,7 @@ import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaPerson;
 import com.example.civilizedcity.service.SysLoginService;
 import com.example.civilizedcity.service.SysUserDutyService;
+import com.example.civilizedcity.service.SysUserService;
 import com.example.civilizedcity.service.TaPersonReflectService;
 import com.example.civilizedcity.vo.LoginParam;
 import com.example.civilizedcity.vo.WxChangePwd;
@@ -168,18 +169,19 @@ public class WxMaController extends BaseController {
         // 解密用户信息
         WxMaUserInfo userInfo = wxMaUitl.getUserInfo(param);
 
-        TaPerson taPerson = currentPerson();
-        if (null == taPerson) {
+        SysUser sysUser = currentUser();
+        if (null == sysUser) {
             throw new Exception("校验当前人员失败, 请重试");
         }
 
-        taPerson.setAvatar(userInfo.getAvatarUrl());
-        taPerson.setName(userInfo.getNickName());
+        sysUser.setAvatar(userInfo.getAvatarUrl());
+        sysUser.setName(userInfo.getNickName());
 //        taPerson.setSex(Integer.parseInt(userInfo.getGender()));
 
-        taPersonService.updateById(taPerson);
+//        taPersonService.updateById(sysUser);
+         sysUserService.updateById(sysUser);
 
-        return ResponseBean.success(taPerson);
+        return ResponseBean.success(sysUser);
     }
 
     @ApiOperation(value = "授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
@@ -189,15 +191,15 @@ public class WxMaController extends BaseController {
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = wxMaUitl.getPhoneNoInfo(code);
 
-        TaPerson taPerson = currentPerson();
-        if (null == taPerson) {
+        SysUser sysUser = currentUser();
+        if (null == sysUser) {
             throw new Exception("校验当前人员失败, 请重试");
         }
 
-        taPerson.setPhone(phoneNoInfo.getPhoneNumber());
-        taPersonService.updateById(taPerson);
+        sysUser.setPhone(phoneNoInfo.getPhoneNumber());
+        sysUserService.updateById(sysUser);
 
-        Map<String, Object> res = sysLoginService.loginByPerson(taPerson);
+        Map<String, Object> res = sysLoginService.loginByPerson(sysUser);
 
         return ResponseBean.success(res);
     }

src/main/java/com/example/civilizedcity/mapper/TaFeedbackMapper.java

@@ -22,7 +22,8 @@ public interface TaFeedbackMapper extends BaseMapper<TaFeedback> {
 
     long countByVerifyStatus(@Param("personId") String personId, @Param("verifyStatus") String verifyStatus);
 
-    Map<String, Object> statMaIndex(@Param("personId") String personId);
+    //    Map<String, Object> statMaIndex(@Param("personId") String personId);
+    Map<String, Object> statMaIndex(@Param("userId") String userId);
 
     IPage<TaIssue> getPageBy(IPage<TaIssue> pg,
                              @Param("personId") String personId,

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(TaPerson taPerson);
+    Map<String, Object> loginByPerson(SysUser sysUser);
 
     void removeByUser(String userId);
 }

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

@@ -2,6 +2,7 @@ package com.example.civilizedcity.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.civilizedcity.entity.SysUser;
 import com.example.civilizedcity.entity.TaFeedback;
 import com.example.civilizedcity.entity.TaIssue;
 import com.example.civilizedcity.entity.TaPerson;
@@ -14,7 +15,7 @@ import com.example.civilizedcity.entity.TaPerson;
  */
 public interface TaFeedbackService extends IBaseService<TaFeedback> {
 
-    void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception;
+    void createNew(TaFeedback taFeedback, SysUser sysUser) throws Exception;
 
     IPage<TaIssue> getPageBy(IPage<TaIssue> pg, String personId, String bizStatus);
 }

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(TaPerson taPerson) {
+    public Map<String, Object> loginByPerson(SysUser sysUser) {
         Map<String, Object> res = new HashMap<>();
         SysUser user = null;
 
-                List<SysUser> sysUserList = sysUserMapper.getListByPhone(taPerson.getPhone());
+                List<SysUser> sysUserList = sysUserMapper.getListByPhone(sysUser.getPhone());
         if (null == sysUserList || sysUserList.size() < 1) {
             user = new SysUser();
-            user.setPhone(taPerson.getPhone());
+            user.setPhone(sysUser.getPhone());
             user.setIsUser(false);
-            user.setOrgId(taPerson.getPersonId()); // 机构ID 使用用户ID , 目前没有使用到
+            user.setOrgId(sysUser.getUserId()); // 机构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("person", taPerson);
+        res.put("user", sysUser);
         res.put("token", StpUtil.getTokenValue());
 
         return res;

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

@@ -24,7 +24,7 @@ import java.util.List;
 public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaFeedback> implements TaFeedbackService {
 
     @Autowired
-    TaPersonMapper taPersonMapper;
+    SysUserMapper sysUserMapper;
 
     @Autowired
     TaIssueMapper taIssueMapper;
@@ -37,25 +37,25 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void createNew(TaFeedback taFeedback, TaPerson taPerson) throws Exception {
+    public void createNew(TaFeedback taFeedback, SysUser sysUser) throws Exception {
 
         // 准备 TaFeedback 数据
         taFeedback.setFeedbackId(StringUtils.uuid());
 
         if (StringUtils.isEmpty(taFeedback.getName())) {
-            taFeedback.setName(taPerson.getName());
+            taFeedback.setName(sysUser.getName());
         } else {
-            if (StringUtils.isEmpty(taPerson.getName())) {
-                taPerson.setName(taFeedback.getName());
-                taPersonMapper.updateById(taPerson);
+            if (StringUtils.isEmpty(sysUser.getName())) {
+                sysUser.setName(taFeedback.getName());
+                sysUserMapper.updateById(sysUser);
             }
         }
 
         if (StringUtils.isEmpty(taFeedback.getPhone())) {
-            taFeedback.setPhone(taPerson.getPhone());
+            taFeedback.setPhone(sysUser.getPhone());
         }
 
-        taFeedback.setPersonId(taPerson.getPersonId());
+        taFeedback.setPersonId(sysUser.getUserId());
         taFeedback.setStatus(Constants.STATUS_NORMAL);
         taFeedback.setCreateDate(LocalDateTime.now());
 
@@ -110,8 +110,8 @@ public class TaFeedbackServiceImpl extends BaseServiceImpl<TaFeedbackMapper, TaF
         process.setProcessNode(Constants.PROCESS_START);
         process.setProcessStatus(Constants.APPLY_READY);
         process.setStatus(Constants.STATUS_NORMAL);
-        process.setCreateUser(taPerson.getPersonId());
-        process.setUserName(StringUtils.isEmpty(taFeedback.getName()) ? "市民" : taPerson.getName());
+        process.setCreateUser(sysUser.getUserId());
+        process.setUserName(StringUtils.isEmpty(taFeedback.getName()) ? "市民" : sysUser.getName());
         process.setCreateDate(LocalDateTime.now());
         taIssueProcessMapper.insert(process);
     }

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

@@ -104,7 +104,8 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
 
         // 市民
         else {
-            Map<String, Object> res = taFeedbackMapper.statMaIndex(person.getPersonId());
+//            Map<String, Object> res = taFeedbackMapper.statMaIndex(person.getPersonId());
+            Map<String, Object> res = taFeedbackMapper.statMaIndex(user.getUserId());
             if (null == res) {
                 res = new HashMap<>();
             }

src/main/resources/mapper/TaFeedbackMapper.xml

@@ -23,7 +23,7 @@
             ta_feedback t
                 JOIN ta_issue s ON t.issue_id = s.issue_id
         WHERE
-            t.person_id = #{personId}
+            t.person_id = #{userId}
           AND t.`status` > -1
     </select>
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">