ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java
New file @@ -0,0 +1,45 @@ package com.ruoyi.web.controller.zhang; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.domain.ZDict; import com.ruoyi.service.ZDictService; import io.swagger.v3.oas.models.security.SecurityScheme; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.naming.ldap.PagedResultsControl; import javax.websocket.server.PathParam; import java.util.List; /** * <p> * 字典表 前端控制器 * </p> * * @author ojq * @since 2023-03-14 */ @RestController @RequestMapping("/zDict") public class ZDictController { @Resource private ZDictService zDictService; @GetMapping("/all") public AjaxResult getAllDict(){ return zDictService.listAllDict(); } @GetMapping("/byId") public AjaxResult getDictById(@PathParam("id")Integer id){ ZDict result = zDictService.getById(id); return AjaxResult.success(result); } } ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java
New file @@ -0,0 +1,31 @@ package com.ruoyi.common.utils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.HashMap; /** * @Version 1.0 * @Author Jin_quan Ou * @Date 2023-03-22 17:08 */ public class MapUtils { public static HashMap<String,Object> getResult(Page pageResult){ HashMap<String, Object> data = new HashMap<>(); data.put("data",pageResult.getRecords()); data.put("total",pageResult.getTotal()); data.put("pageNum",pageResult.getCurrent()); data.put("pageSize",pageResult.getSize()); return data; } public static HashMap<String,Object> getResult(Page pageResult,Object record){ HashMap<String, Object> data = new HashMap<>(); data.put("data",record); data.put("total",pageResult.getTotal()); data.put("pageNum",pageResult.getCurrent()); data.put("pageSize",pageResult.getSize()); return data; } } zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -18,9 +18,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.constant.MenuAuthority.DOCTOR_LIST; @Slf4j @Service public class LiveStreamingServiceImpl extends ServiceImpl<LiveStreamingMapper, LiveStreaming> implements LiveStreamingService { zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -22,12 +22,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.constant.MenuAuthority.*; @Slf4j @Service zhang-content/src/main/java/com/ruoyi/service/impl/PhyscialServiceImpl.java
@@ -1,7 +1,6 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; @@ -10,8 +9,6 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.Physcial; import com.ruoyi.domain.Physcial; import com.ruoyi.domain.Physcial; import com.ruoyi.mapper.PhyscialMapper; import com.ruoyi.service.PhyscialService; @@ -25,7 +22,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; /** * <p> zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.domain.TravelCount; import com.ruoyi.domain.TravelDetail; import com.ruoyi.domain.ZfProperty; import com.ruoyi.mapper.TravelCountMapper; import com.ruoyi.service.TravelCountService; import com.ruoyi.service.TravelDetailService; @@ -18,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import java.text.DecimalFormat; import java.util.Date; import java.util.List; /** zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java
New file @@ -0,0 +1,56 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZExperience; import com.ruoyi.mapper.ZExperienceMapper; import com.ruoyi.service.ZExperienceService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.stream.Collectors; /** * <p> * 服务实现类 * </p> * * @author ojq * @since 2023-03-14 */ @Slf4j @Service public class ZExperienceServiceImpl extends ServiceImpl<ZExperienceMapper, ZExperience> implements ZExperienceService { @Override public List<ZExperience> selectExperienceList(Long userId) { LambdaQueryWrapper<ZExperience> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZExperience::getUserId,userId); return list(lqw); } @Override public boolean importExcel(MultipartFile file, Long userId) { ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class); List<ZExperience> propertyList = null; try { propertyList = util.importExcel(file.getInputStream()); } catch (Exception e) { e.printStackTrace(); } assert propertyList != null; List<ZExperience> list = propertyList.stream().peek( (property) -> property.setUserId(userId) ).collect(Collectors.toList()); log.info("资产列表为:{}",list); return saveBatch(list); } } zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
@@ -10,12 +10,8 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZAbroad; import com.ruoyi.domain.ZHonor; import com.ruoyi.domain.ZfCollection; import com.ruoyi.domain.ZfProperty; import com.ruoyi.mapper.ZHonorMapper; import com.ruoyi.mapper.ZYearInfoMapper; import com.ruoyi.service.ZHonorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +23,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; /** * <p> zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
@@ -11,7 +11,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZIdea; import com.ruoyi.domain.ZIdea; import com.ruoyi.mapper.ZIdeaMapper; import com.ruoyi.service.ZIdeaService; import org.springframework.beans.factory.annotation.Autowired; zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; @@ -28,7 +26,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; /** * <p> @@ -639,7 +636,7 @@ user.setRoleName(roleName); System.out.println("dddddddddddddddddddd"); System.out.println(familyId); if(familyId!=-1) if(familyId!=null||familyId!=-1) { String familyName = zfFamilyService.getById(familyId).getName(); user.setFamilyName(familyName); zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
@@ -11,8 +11,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZProperty; import com.ruoyi.domain.ZProperty; import com.ruoyi.domain.ZfProperty; import com.ruoyi.mapper.ZPropertyMapper; import com.ruoyi.service.ZPropertyService; import org.springframework.beans.factory.annotation.Autowired; zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -11,10 +11,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZSecret; import com.ruoyi.domain.ZSecret; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZSecretMapper; import com.ruoyi.service.ZHonorService; import com.ruoyi.service.ZSecretService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -11,7 +11,6 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZSelfNote; import com.ruoyi.domain.ZSelfNote; import com.ruoyi.mapper.ZSelfNoteMapper; import com.ruoyi.service.ZSelfNoteService; import org.springframework.beans.factory.annotation.Autowired; zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
@@ -4,14 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.domain.ZTravelBase; import com.ruoyi.domain.ZTravelBase; import com.ruoyi.domain.ZTravelBase; import com.ruoyi.mapper.ZTravelBaseMapper; import com.ruoyi.service.ZTravelBaseService; zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
@@ -1,7 +1,6 @@ package com.ruoyi.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,10 +9,8 @@ import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.domain.ZTravelBase; import com.ruoyi.domain.ZTravelPrice; import com.ruoyi.domain.ZTravelPrice; import com.ruoyi.domain.ZTravelPriceDetail; import com.ruoyi.domain.dto.PriceDto; @@ -21,11 +18,9 @@ import com.ruoyi.service.ZTravelBaseService; import com.ruoyi.service.ZTravelPriceDetailService; import com.ruoyi.service.ZTravelPriceService; import org.apache.xmlbeans.impl.xb.xmlschema.LangAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.util.*; import java.util.stream.Collectors; zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -10,15 +10,12 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZProperty; import com.ruoyi.domain.ZYearInfo; import com.ruoyi.domain.ZYearInfo; import com.ruoyi.mapper.ZYearInfoMapper; import com.ruoyi.service.ZYearInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; @@ -17,7 +15,6 @@ import com.ruoyi.mapper.ZfCleanMapper; import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -1,24 +1,18 @@ package com.ruoyi.service.impl; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonParser; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.domain.ZfCollection; import com.ruoyi.domain.ZfCollection; import com.ruoyi.mapper.ZfCollectionMapper; import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -6,18 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.domain.ZfContact; import com.ruoyi.domain.ZfContact; import com.ruoyi.mapper.ZfContactMapper; import com.ruoyi.service.*; import com.ruoyi.service.ZfContactService; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; @@ -20,7 +18,6 @@ import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -6,17 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.domain.ZfEconomy; import com.ruoyi.domain.ZfEconomy; import com.ruoyi.mapper.ZfEconomyMapper; import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -6,16 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.domain.ZfEquipment; import com.ruoyi.mapper.ZfEquipmentMapper; import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -1,30 +1,23 @@ package com.ruoyi.service.impl; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.*; import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZfEventMapper; import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
@@ -7,10 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfPet; import com.ruoyi.domain.ZfPetNote; import com.ruoyi.domain.ZfProperty; import com.ruoyi.mapper.ZfPetNoteMapper; import com.ruoyi.service.ZfPetNoteService; import lombok.extern.slf4j.Slf4j; zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -5,20 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.domain.*; import com.ruoyi.mapper.ZfPetMapper; import com.ruoyi.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource;