zhangshi_app_backend.git

			@@ -18,6 +18,8 @@
			import org.elasticsearch.action.update.UpdateRequest;
			import org.elasticsearch.client.RequestOptions;
			import org.elasticsearch.client.RestHighLevelClient;
			import org.springframework.cache.annotation.CacheEvict;
			import org.springframework.cache.annotation.Cacheable;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.multipart.MultipartFile;
			@@ -40,7 +42,7 @@
			*/
			@Service
			@Slf4j
			public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService {
			public class ZfEconomyServiceImpl extends ServiceImpl<ZfEconomyMapper, ZfEconomy> implements ZfEconomyService,ModuleSearchable{
			@Resource
			ZfEconomyService zfEconomyService;

			@@ -76,8 +78,15 @@
			lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
			lqw.like(StringUtils.isNotEmpty(zfEconomy.getBalance()),ZfEconomy::getBalance,zfEconomy.getBalance());
			lqw.like(StringUtils.isNotEmpty(zfEconomy.getRemark()),ZfEconomy::getRemark,zfEconomy.getRemark());
			lqw.like(StringUtils.isNotEmpty(zfEconomy.getCompanion()),ZfEconomy::getCompanion,zfEconomy.getCompanion());
			// if (zfEconomy.getYear() != 0) {
			// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfEconomy.getYear());
			// lqw.apply("YEAR(happen_time) = {0}", zfEconomy.getYear());
			// }
			lqw.eq(zfEconomy.getHappenTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenTime());
			lqw.between(zfEconomy.getHappenStartTime() != null && zfEconomy.getHappenEndTime() != null, ZfEconomy::getHappenTime, zfEconomy.getHappenStartTime(), zfEconomy.getHappenEndTime());
			System.out.println("查询条件: " + lqw.getCustomSqlSegment());

			return lqw;
			}

			@@ -425,6 +434,9 @@

			@Override
			public AjaxResult addData(ZfEconomy zfEconomy) {
			//清除redis中zfEconomy的缓存
			clearAllCache();

			ZInfoUser myself = zInfoUserService.getMyself();
			Long familyId = myself.getFamilyId();

			@@ -479,6 +491,9 @@

			@Override
			public AjaxResult updateData(ZfEconomy zfEconomy) {
			//清除redis中zfEconomy的缓存
			clearAllCache();

			ZInfoUser myself = zInfoUserService.getMyself();
			Long familyId = myself.getFamilyId();

			@@ -600,4 +615,24 @@
			}


			@Override
			public String getModuleCode() {
			return "2045";
			}

			@Override
			@Cacheable(value = "economy_search", key = "T(String).format('2045_%s_%s_%s',#companion != null ? #companion : 'null',#happenStartTime != null ? #happenStartTime.getTime() : 0,#happenEndTime != null ? #happenEndTime.getTime() : 0)")
			public List<?> search(String companion, Date happenStartTime,Date happenEndTime) {
			ZfEconomy zfEconomy = new ZfEconomy();
			zfEconomy.setCompanion(companion);
			zfEconomy.setHappenStartTime(happenStartTime);
			zfEconomy.setHappenEndTime(happenEndTime);
			System.out.println("ssssss"+zfEconomy);
			return selectByCondition(zfEconomy);
			}

			@CacheEvict(value = "economy_search", allEntries = true)
			public void clearAllCache() {
			System.out.println("清除所有经济搜索缓存");
			}
			}