去掉缓存

eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java

@@ -59,7 +59,7 @@ public class RedisConfig extends CachingConfigurerSupport {
 
     /**
      *  设置 redis 数据默认过期时间，默认2小时
-     *  设置@cacheable 序列化方式
+     *  设置//@Cacheable 序列化方式
      */
     @Bean
     public RedisCacheConfiguration redisCacheConfiguration(){

eladmin-system/src/main/java/me/zhengjie/appapi/controller/MiniProgramController.java

@@ -6,6 +6,7 @@ import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.service.*;
 import me.zhengjie.appapi.tencent.h5face.SdkTest;
 import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.appapi.vo.OrderVo;
 import me.zhengjie.appapi.vo.SmsVo;
 import me.zhengjie.appapi.vo.UserVo;
 import me.zhengjie.base.ResponseDTO;
@@ -95,6 +96,16 @@ public class MiniProgramController {
 		}
 		return ResponseDTO.success(order);
 	}
+	@RequestMapping("/order/search")
+	public ResponseDTO<?> orderSearch( @RequestBody OrderVo order ) {
+		 
+		if (order == null) {
+			return ResponseDTO.error(ResultCode.PARAM_IS_BLANK);
+		}
+		 List<OrderDto> orders = this.apiService.getOrderByContion(order);
+		
+		return ResponseDTO.success(orders);
+	}
 
 	@RequestMapping("/live/verify")
 	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {

eladmin-system/src/main/java/me/zhengjie/appapi/entity/BorrowerEntity.java

@@ -39,6 +39,7 @@ public class BorrowerEntity extends Model<BorrowerEntity> implements Serializabl
 	/**
 	 * 借款合同编号
 	 */
+	@QueryWapper(value=QueryKeyword.LIKE )
 	@TableField("contract_no")
 	private String contractNo;
 

eladmin-system/src/main/java/me/zhengjie/appapi/entity/GuaranteeEntity.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import me.zhengjie.appapi.plus.QueryKeyword;
+import me.zhengjie.appapi.plus.QueryWapper;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -35,6 +39,7 @@ public class GuaranteeEntity implements Serializable {
     /**
      * 担保合同编号
      */
+    @QueryWapper(value=QueryKeyword.LIKE )
     @TableField("contract_no")
     private String contractNo;
 

eladmin-system/src/main/java/me/zhengjie/appapi/entity/MortgageEntity.java

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import me.zhengjie.appapi.plus.QueryKeyword;
+import me.zhengjie.appapi.plus.QueryWapper;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -35,6 +39,7 @@ public class MortgageEntity implements Serializable {
     /**
      * 抵押合同编号
      */
+    @QueryWapper(value=QueryKeyword.LIKE )
     @TableField("contract_no")
     private String contractNo;
 

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/ApiServiceImpl.java

@@ -139,6 +139,7 @@ public class ApiServiceImpl implements ApiService {
 		borrower.setUsername(user.getUserName());
 		borrower.setPhone(user.getPhone());
 		borrower.setBusinessNo(user.getBusinessNo());
+		borrower.setContractNo(user.getContractNo());
 		borrower.setStatus(user.getStatus());
 		QueryWrapper<BorrowerEntity> queryWrapper = QueryWrapperUtil.convertQuery(borrower);
 		List<BorrowerEntity> borrowers = borrowerService.list(queryWrapper);
@@ -152,6 +153,7 @@ public class ApiServiceImpl implements ApiService {
 		mortgage.setPhone(user.getPhone());
 		mortgage.setStatus(user.getStatus());
 		mortgage.setBusinessNo(user.getBusinessNo());
+		mortgage.setContractNo(user.getContractNo());
 		QueryWrapper<MortgageEntity> mortgageWrapper = QueryWrapperUtil.convertQuery(mortgage);
 		List<MortgageEntity> mortgages = mortgageService.list(mortgageWrapper);
 		if (user.getBusinessNo() == null && mortgages != null && mortgages.size() > 0) {
@@ -164,6 +166,7 @@ public class ApiServiceImpl implements ApiService {
 		guarantee.setPhone(user.getPhone());
 		guarantee.setStatus(user.getStatus());
 		guarantee.setBusinessNo(user.getBusinessNo());
+		guarantee.setContractNo(user.getContractNo());
 		QueryWrapper<GuaranteeEntity> guaranteeWrapper = QueryWrapperUtil.convertQuery(guarantee);
 		List<GuaranteeEntity> guarantees = guaranteeService.list(guaranteeWrapper);
 		if (user.getBusinessNo() == null && guarantees != null && guarantees.size() > 0) {

eladmin-system/src/main/java/me/zhengjie/appapi/vo/OrderVo.java

@@ -16,10 +16,10 @@ public class OrderVo {
 	// 身份证号不能为空
 	private String idCode;
 	// 1.待公证 2待审核 3已签发 4已驳回
- 
 	private String status;
 	//业务流水
 	private String businessNo;
-
+	//合同编号
+	private String contractNo;
 
 }

eladmin-system/src/main/java/me/zhengjie/appapi/vo/UserVo.java

@@ -24,6 +24,8 @@ public class UserVo {
 	@ApiModelProperty(value = "1.待公证 2待审核 3已签发 4已驳回")
 	private String status;
 	
+	
+	
 	public String getUserName() {
 		return userName;
 	}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java

@@ -48,7 +48,7 @@ public class DataServiceImpl implements DataService {
      * @return /
      */
     @Override
-    @Cacheable(key = "'user:' + #p0.id")
+    //@Cacheable(key = "'user:' + #p0.id")
     public List<Long> getDeptIds(UserDto user) {
         // 用于存储部门id
         Set<Long> deptIds = new HashSet<>();

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java

@@ -88,7 +88,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public DeptDto findById(Long id) {
         Dept dept = deptRepository.findById(id).orElseGet(Dept::new);
         ValidationUtil.isNull(dept.getId(),"Dept","id",id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java

@@ -74,7 +74,7 @@ public class DictDetailServiceImpl implements DictDetailService {
     }
 
     @Override
-    @Cacheable(key = "'name:' + #p0")
+    //@Cacheable(key = "'name:' + #p0")
     public List<DictDetailDto> getDictByName(String name) {
         return dictDetailMapper.toDto(dictDetailRepository.findByDictName(name));
     }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java

@@ -64,7 +64,7 @@ public class JobServiceImpl implements JobService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public JobDto findById(Long id) {
         Job job = jobRepository.findById(id).orElseGet(Job::new);
         ValidationUtil.isNull(job.getId(),"Job","id",id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -83,7 +83,7 @@ public class MenuServiceImpl implements MenuService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public MenuDto findById(long id) {
         Menu menu = menuRepository.findById(id).orElseGet(Menu::new);
         ValidationUtil.isNull(menu.getId(),"Menu","id",id);
@@ -96,7 +96,7 @@ public class MenuServiceImpl implements MenuService {
      * @return /
      */
     @Override
-    @Cacheable(key = "'user:' + #p0")
+    //@Cacheable(key = "'user:' + #p0")
     public List<MenuDto> findByUser(Long currentUserId) {
         List<RoleSmallDto> roles = roleService.findByUsersId(currentUserId);
         Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -82,7 +82,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
     public RoleDto findById(long id) {
         Role role = roleRepository.findById(id).orElseGet(Role::new);
@@ -165,7 +165,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    @Cacheable(key = "'auth:' + #p0.id")
+    //@Cacheable(key = "'auth:' + #p0.id")
     public List<GrantedAuthority> mapToGrantedAuthorities(UserDto user) {
         Set<String> permissions = new HashSet<>();
         // 如果是管理员直接返回

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -253,7 +253,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
     public UserDto findById(long id) {
         User user = userRepository.findById(id).orElseGet(User::new);

eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java

@@ -44,14 +44,14 @@ public class AliPayServiceImpl implements AliPayService {
     private final AliPayRepository alipayRepository;
 
     @Override
-    @Cacheable(key = "'config'")
+    //@Cacheable(key = "'config'")
     public AlipayConfig find() {
         Optional<AlipayConfig> alipayConfig = alipayRepository.findById(1L);
         return alipayConfig.orElseGet(AlipayConfig::new);
     }
 
     @Override
-    @CachePut(key = "'config'")
+//    @CachePut(key = "'config'")
     @Transactional(rollbackFor = Exception.class)
     public AlipayConfig config(AlipayConfig alipayConfig) {
         alipayConfig.setId(1L);

eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java

@@ -43,7 +43,7 @@ public class EmailServiceImpl implements EmailService {
     private final EmailRepository emailRepository;
 
     @Override
-    @CachePut(key = "'config'")
+//    @CachePut(key = "'config'")
     @Transactional(rollbackFor = Exception.class)
     public EmailConfig config(EmailConfig emailConfig, EmailConfig old) throws Exception {
         emailConfig.setId(1L);
@@ -55,7 +55,7 @@ public class EmailServiceImpl implements EmailService {
     }
 
     @Override
-    @Cacheable(key = "'config'")
+    //@Cacheable(key = "'config'")
     public EmailConfig find() {
         Optional<EmailConfig> emailConfig = emailRepository.findById(1L);
         return emailConfig.orElseGet(EmailConfig::new);

eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

@@ -65,14 +65,14 @@ public class QiNiuServiceImpl implements QiNiuService {
     private Long maxSize;
 
     @Override
-    @Cacheable(key = "'config'")
+    //@Cacheable(key = "'config'")
     public QiniuConfig find() {
         Optional<QiniuConfig> qiniuConfig = qiNiuConfigRepository.findById(1L);
         return qiniuConfig.orElseGet(QiniuConfig::new);
     }
 
     @Override
-    @CachePut(key = "'config'")
+//    @CachePut(key = "'config'")
     @Transactional(rollbackFor = Exception.class)
     public QiniuConfig config(QiniuConfig qiniuConfig) {
         qiniuConfig.setId(1L);