缓存，标签

zxkf-api/src/main/java/api/controller/IndexController.java

@@ -7,6 +7,7 @@ import api.entity.database.order.HourReport;
 import api.entity.database.order.Report;
 import api.entity.database.order.WorkOrderBase;
 
+import api.entity.database.system.User;
 import api.service.call.IRecordService;
 import api.service.online.IMessageService;
 import api.service.order.IReportBaseService;
@@ -14,18 +15,21 @@ import api.service.order.IWorkOrderBaseService;
 import api.service.system.*;
 import api.util.annotation.Anonymous;
 
+import api.util.annotation.Log;
+import api.util.enums.BusinessType;
+import api.util.helper.SecretHelper;
+import api.util.helper.StringHelper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import api.entity.database.system.Dept;
 import api.entity.database.system.Menu;
 import api.entity.view.system.UserView;
 import api.model.AjaxResult;
 
+import io.swagger.annotations.ApiOperation;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.text.SimpleDateFormat;
@@ -349,4 +353,5 @@ public class IndexController extends BaseController {
 
     }
 
+
 }

zxkf-api/src/main/java/api/controller/system/CustomerController.java

@@ -49,6 +49,7 @@ public class CustomerController extends BaseController {
         qw.eq(input.getCustomerId() != null && input.getCustomerId() > 0, Customer::getCustomerId, input.getCustomerId());
         qw.like(!StringHelper.isEmpty(input.getCustomerName()), Customer::getCustomerName, input.getCustomerName());
         qw.eq(!StringHelper.isEmpty(input.getCustomerSex()), Customer::getCustomerSex, input.getCustomerSex());
+        qw.eq(!StringHelper.isEmpty(input.getLabel()), Customer::getLabel, input.getLabel());
         qw.like(!StringHelper.isEmpty(input.getCustomerPhone()), Customer::getCustomerPhone, input.getCustomerPhone());
         qw.like(!StringHelper.isEmpty(input.getCustomerMobile()), Customer::getCustomerMobile, input.getCustomerMobile());
         qw.like(!StringHelper.isEmpty(input.getCustomerNumber()), Customer::getCustomerNumber, input.getCustomerNumber());
@@ -93,6 +94,7 @@ public class CustomerController extends BaseController {
         qw.like(!StringHelper.isEmpty(input.getCustomerPhone()), Customer::getCustomerPhone, input.getCustomerPhone());
         qw.like(!StringHelper.isEmpty(input.getCustomerMobile()), Customer::getCustomerMobile, input.getCustomerMobile());
         qw.like(!StringHelper.isEmpty(input.getCustomerNumber()), Customer::getCustomerNumber, input.getCustomerNumber());
+        qw.eq(!StringHelper.isEmpty(input.getLabel()), Customer::getLabel, input.getLabel());
         qw.like(!StringHelper.isEmpty(input.getRemarks()), Customer::getRemarks, input.getRemarks());
         qw.eq(Customer::getFIsdelete, 0);
         qw.eq(input.getFCreatetime() != null , Customer::getFCreatetime, input.getFCreatetime());

zxkf-api/src/main/java/api/controller/system/UserController.java

@@ -1,5 +1,6 @@
 package api.controller.system;
 
+import api.util.annotation.Anonymous;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -86,6 +87,14 @@ public class UserController extends BaseController {
         } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return Error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
+        if (StringHelper.isEmpty(user.getPassword()))
+            return Error("请输入密码");
+        if (StringHelper.isEmpty(user.getUserName()))
+            return Error("请输入姓名");
+        if (StringHelper.isEmpty(user.getNickName()))
+            return Error("请输入工号");
+        if (StringHelper.isEmpty(user.getStatus()))
+            return Error("请选择状态");
         user.setPassword(SecretHelper.MD5(user.getPassword()));
         user.setCreateBy(CurrentUser().getUserName());
         user.setCreateTime(new Date());
@@ -110,6 +119,10 @@ public class UserController extends BaseController {
         } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return Error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
+        User use = userService.selectUserById(user.getUserId());
+        if (use==null)
+            return Error("用户不存在");
+        user.setPassword(use.getPassword());
         user.setCreateBy(CurrentUser().getUserName());
         user.setCreateTime(new Date());
         boolean result = userService.update(user);

zxkf-entity/src/main/java/api/entity/database/system/Customer.java

@@ -129,4 +129,8 @@ public class Customer {
     @ApiModelProperty("项目id")
     private Long project;
 
+    @ApiModelProperty("标签")
+    private String  label;
+
+
 }

zxkf-service/src/main/java/api/service/system/impl/RoleServiceImpl.java

@@ -1,5 +1,7 @@
 package api.service.system.impl;
 
+import api.util.helper.RedisHelper;
+import api.util.helper.SpringHelper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import api.entity.database.system.Role;
 import api.entity.database.system.RoleDept;
@@ -12,6 +14,8 @@ import api.mapper.system.UserRoleMapper;
 import api.service.BaseServiceImpl;
 import api.service.system.IRoleService;
 import api.util.helper.StringHelper;
+import net.bytebuddy.asm.Advice;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -85,6 +89,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
         this.update(role);
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+        removeCache("RoleMenu");
         return insertRoleMenu(role)>0;
     }
     /**
@@ -285,4 +290,12 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
         }
         return roles;
     }
+
+    private boolean removeCache( String clsName) {
+        RedisHelper redisHelper = SpringHelper.getBean(RedisHelper.class);
+        if (redisHelper.hasKey("database:"+clsName)) {
+            return redisHelper.deleteCache("database:"+clsName);
+        }
+        return true;
+    }
 }