add feat

src/main/java/com/njyunzhi/invoice/common/BaseController.java

@@ -1,7 +1,47 @@
 package com.njyunzhi.invoice.common;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.njyunzhi.invoice.entity.SysUser;
+import com.njyunzhi.invoice.entity.TaPerson;
+import com.njyunzhi.invoice.service.ISysUserService;
+import com.njyunzhi.invoice.service.ITaPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class BaseController {
+
+    @Autowired
+    public ISysUserService iSysUserService;
+
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    public SysUser currentUser() throws Exception {
+        String loginId = StpUtil.getLoginIdAsString();
+        if (StringUtils.isEmpty(loginId)) {
+            throw new Exception("请先登录");
+        }
+
+        SysUser user = iSysUserService.getById(loginId);
+        if (user == null || user.getStatus() == Constants.STATUS_DELETE) {
+            throw new Exception("人员不存在");
+        }
+
+        return user;
+    }
+
+    public TaPerson currentPerson() throws Exception {
+        String loginId = StpUtil.getLoginIdAsString();
+        if (StringUtils.isEmpty(loginId)) {
+            throw new Exception("请先登录");
+        }
+
+        TaPerson user = iTaPersonService.getById(loginId);
+        if (user == null || user.getStatus() == Constants.STATUS_DELETE) {
+            throw new Exception("人员不存在");
+        }
+
+        return user;
+    }
 }

src/main/java/com/njyunzhi/invoice/controller/LoginController.java

@@ -25,9 +25,6 @@ import java.util.Map;
 @RequestMapping("/")
 public class LoginController extends BaseController {
 
-    @Autowired
-    ISysUserService iSysUserService;
-
     @PostMapping("/admin/login")
     @ApiOperation(value="后台登录", notes = "后台登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean login(@ApiParam("登录参数") @RequestBody LoginParm loginParm) throws Exception {

src/main/java/com/njyunzhi/invoice/controller/SysUserController.java

@@ -46,7 +46,7 @@ public class SysUserController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysUser",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/user",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysUserList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{

src/main/java/com/njyunzhi/invoice/service/IBaseService.java

@@ -0,0 +1,36 @@
+package com.njyunzhi.invoice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+import java.util.List;
+
+public interface IBaseService<T> extends IService<T> {
+    /**
+     * 逻辑删除
+     * @param id
+     * @return
+     */
+    boolean removeLogicById(Serializable id);
+
+    /**
+     * 逻辑删除
+     * @param id
+     * @return
+     */
+    boolean removeLogicByUser(Serializable id, String userId, String userType);
+
+    boolean removeBy(String column, Object value, boolean notDelete);
+
+    boolean canAccessData(Serializable id, String userId);
+
+    boolean remvoeWithDataScope(Serializable id, String userId);
+
+    int countBy(String column, Object value, boolean notDelete);
+
+    T getByButNot(String column, Object value, String col, Object val, boolean notDelete);
+
+    T getExistBy(String column, Object value, boolean normal, boolean notDelete);
+
+    List<T> getListBy(String column, Object value, boolean normal, boolean notDelete);
+}

src/main/java/com/njyunzhi/invoice/service/impl/BaseServiceImpl.java

@@ -0,0 +1,130 @@
+package com.njyunzhi.invoice.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.njyunzhi.invoice.service.IBaseService;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements IBaseService<T> {
+    @Override
+    public boolean removeLogicById(Serializable id) {
+
+        TableInfo tableInfo = SqlHelper.table(currentModelClass());
+        UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", -1)
+                .eq(tableInfo.getKeyColumn(), id);
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean removeLogicByUser(Serializable id, String userId, String userType) {
+
+        TableInfo tableInfo = SqlHelper.table(currentModelClass());
+        UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", -1)
+                .set("delete_user_type", userType)
+                .set("delete_user", userId)
+                .set("delete_date", LocalDateTime.now())
+                .eq(tableInfo.getKeyColumn(), id);
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean removeBy(String column, Object value, boolean notDelete) {
+        if (notDelete) {
+            UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("status", -1);
+            updateWrapper.eq(column, value);
+            return update(updateWrapper);
+        } else {
+            QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(column, value);
+            return remove(queryWrapper);
+        }
+    }
+
+    @Override
+    public boolean canAccessData(Serializable id, String userId) {
+        TableInfo tableInfo = SqlHelper.table(currentModelClass());
+
+        String t = tableInfo.getTableName();
+//        String k = tableInfo.getKeyColumn();
+        String kAlias = t + ".org_id";
+
+        String joinSQL = "INNER JOIN sys_user_data_scope s ON ( "+ kAlias +" = s.org_id OR "+t+".create_user = s.user_id )";
+        String whereSQL = "WHERE " + kAlias + " = '"+ id +"' AND s.user_id = '" + userId + "'";
+
+        String sql = joinSQL + " " + whereSQL;
+
+        QueryWrapper<T> wrapper = new QueryWrapper<>();
+        wrapper.last(sql);
+        return count(wrapper) > 0;
+    }
+
+    @Override
+    public boolean remvoeWithDataScope(Serializable id, String userId) {
+        TableInfo tableInfo = SqlHelper.table(currentModelClass());
+
+        String t = tableInfo.getTableName();
+        String k = tableInfo.getKeyColumn();
+        String kAlias = t + "." + k;
+
+        String joinSQL = "INNER JOIN sys_user_data_scope s ON ( "+ kAlias +" = s.org_id OR "+t+".create_user = s.user_id )";
+        String setSQL = "SET status = -1";
+        String whereSQL = "WHERE " + kAlias + " = '"+ id +"' AND s.user_id = '" + userId + "'";
+
+        String sql = joinSQL + " " + setSQL + " " + whereSQL;
+
+        UpdateWrapper<T> wrapper = new UpdateWrapper<>();
+        wrapper.last(sql);
+        return update(wrapper);
+    }
+
+    @Override
+    public int countBy(String column, Object value, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.gt(notDelete, "status", -1);
+
+        return (int) count(queryWrapper);
+    }
+
+    @Override
+    public T getByButNot(String column, Object value, String col, Object val, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.ne(col, val);
+        queryWrapper.gt(notDelete, "status", -1);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public T getExistBy(String column, Object value, boolean normal, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.eq(normal, "status", 1);
+        queryWrapper.gt(notDelete, "status", -1);
+        queryWrapper.last("limit 1");
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public List<T> getListBy(String column, Object value, boolean normal, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.eq(normal, "status", 1);
+        queryWrapper.gt(notDelete, "status", -1);
+        return list(queryWrapper);
+    }
+}