From ca4a0a5e9237f95f1a72640c88bc129b819fb8e2 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 13 五月 2024 19:52:33 +0800
Subject: [PATCH] 提交根据id查询接口
---
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java | 26 +++++++++++++++++---------
zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java | 4 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java | 9 +++++++++
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
index d1bbed3..027836c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MeetingStatisticController.java
@@ -19,6 +19,7 @@
public class MeetingStatisticController extends BaseController {
@Autowired
private MeetingStatisticService meetingStatisticService;
+
/**
* 鍏ㄩ儴鏁版嵁
*/
@@ -29,6 +30,14 @@
return meetingStatisticService.selectDataList(meetingStatistic, pageNum, pageSize);
}
/**
+ * 鏍规嵁id,鑾峰彇浼氳璁板綍璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(meetingStatisticService.getById(id));
+ }
+
+ /**
* 鍙緭鍑哄搴彿鍜屽垱寤烘椂闂�
*/
@GetMapping("/one")
diff --git a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
index 4346d1e..6b81a0c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.MeetingStatistic;
+import java.util.List;
+
public interface MeetingStatisticService extends IService<MeetingStatistic> {
AjaxResult updateData(MeetingStatistic meetingStatistic);
@@ -14,5 +16,7 @@
AjaxResult addData(MeetingStatistic meetingStatistic);
+ List<MeetingStatistic> selectByIds(Long[] ids);
+
AjaxResult selectDataList(MeetingStatistic meetingStatistic, Integer pageNum, Integer pageSize);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
index 90129db..fc33ed5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
@@ -56,7 +56,7 @@
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getFamilyId())), MeetingStatistic::getFamilyId, meetingStatistic.getFamilyId());
return lqw;
}
- public static String getDatePoor(Date endDate, Date nowDate, MeetingStatistic meetingStatistic) {
+ public static void getDatePoor(Date endDate, Date nowDate, MeetingStatistic meetingStatistic) {
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
@@ -74,7 +74,6 @@
long sec = diff % nd % nh % nm / ns;
System.out.println(hour + "灏忔椂" + min + "鍒嗛挓"+ sec + "绉�");
meetingStatistic.setUseTime(hour + "灏忔椂" + min + "鍒嗛挓" + sec + "绉�");
- return meetingStatistic.getUseTime();
}
private LambdaQueryWrapper<MeetingStatistic> buildCondition(MeetingStatistic meetingStatistic) {
LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
@@ -106,6 +105,7 @@
Page<MeetingStatistic> pageResult = page(meetingStatisticPage, lqw);
List<MeetingStatistic> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ System.out.println("-----------鏁版嵁搴�-----------"+beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
return AjaxResult.success(data);
}
@@ -153,7 +153,6 @@
if (meetingStatistic.getUseTime()==null){
if(meetingStatistic.getHappenEndTime()!=null && meetingStatistic.getHappenStartTime() !=null){
getDatePoor(meetingStatistic.getHappenEndTime(),meetingStatistic.getHappenStartTime(),meetingStatistic);
- System.out.println("===============浣跨敤鏃堕棿1====================="+meetingStatistic.getUseTime());
newModel.setBy1(meetingStatistic.getUseTime());
}
else {
@@ -168,12 +167,8 @@
// newModel.setBy3(dataById.getConferenceRoom());
// }
if(meetingStatistic.getTitle()!=null){
-// System.out.println("===============浣跨敤鏃堕棿2====================="+dataById);
-// System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic);
newModel.setBy2(meetingStatistic.getTitle());
}else {
-// System.out.println("===============浣跨敤鏃堕棿2====================="+dataById);
-// System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic);
newModel.setBy2(dataById.getTitle());
}
// if(meetingStatistic.getApplyPerson()!=null){
@@ -191,8 +186,6 @@
// }else {
// newModel.setBy11(dataById.getStatus());
// }
- System.out.println("===============浣跨敤鏃堕棿2====================="+dataById);
- System.out.println("===============浣跨敤鏃堕棿2====================="+meetingStatistic);
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
"by1",newModel.getBy1(),
@@ -200,11 +193,16 @@
);
+ LambdaQueryWrapper<MeetingStatistic> lqw = new LambdaQueryWrapper<>();
+ List<MeetingStatistic> beanRecords = list(lqw);
+ log.info("sss浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
+
try {
restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
} catch (IOException e) {
throw new RuntimeException(e);
}
+
return AjaxResult.success();
}else {
@@ -237,6 +235,16 @@
}
@Override
+ public List<MeetingStatistic> selectByIds(Long[] ids) {
+ List<MeetingStatistic> list = new ArrayList<>();
+ if (ids.length != 0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+
+ }
+ @Override
public AjaxResult addData(MeetingStatistic meetingStatistic) {
ZInfoUser myself = zInfoUserService.getMyself();
--
Gitblit v1.9.1