From 290a01c4a1eb457e858ca52d7b1c03a6f23e4488 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:20:00 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java | 2 +-
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 3 ++-
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java | 8 ++++++++
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 3 +++
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java | 2 +-
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 6 ++++--
ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java | 6 ++++++
ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java | 2 ++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 2 +-
ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java | 4 ++++
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 4 ++--
12 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
index c06c0e1..77659e2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
@@ -1,5 +1,6 @@
package com.ycl.controller.message;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
@@ -61,6 +62,13 @@
return CommonResult.success(iMessageColumnService.list());
}
+ @ApiOperation(value = "鑾峰彇鏄剧ず鐨勬爮鐩�")
+ @RequestMapping(value = "/getShowColumn", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult getShowColumn() {
+ return CommonResult.success(iMessageColumnService.list(new LambdaQueryWrapper<MessageColumn>().eq(MessageColumn::getIsShow,1)));
+ }
+
@ApiOperation(value = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
@RequestMapping(value = "/list", method = RequestMethod.POST)
@ResponseBody
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 2657d6e..d98ac78 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -52,8 +52,10 @@
@LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "鏌ヨ闂ㄥ簵")
public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
- @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
- Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(value = "status", required = false) String status
+ ) {
+ Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum,status);
return CommonResult.success(CommonPage.restPage(storeInfoPage));
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
index 25bb703..9e28e1f 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
@@ -52,4 +52,8 @@
@ApiModelProperty("鎽勫儚澶�")
private String relationVideo;
+
+ @ApiModelProperty("搴楅摵鐘舵��")
+ @TableField("status")
+ private String status;
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java b/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java
index 850702c..78f60d9 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java
@@ -12,6 +12,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
/**
* <p>
@@ -24,6 +25,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_video_point")
+@NoArgsConstructor
public class VideoPoint implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
index 9cc6c93..bb03158 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
@@ -15,5 +15,5 @@
*/
public interface StoreInfoMapper extends BaseMapper<StoreInfo> {
- Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword);
+ Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword,String status);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 059a182..7889f19 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -123,7 +123,7 @@
, uploadDisposingResultParam.getWritPic()));
iImageResourcesService.updateById(imageResources);
}
- return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.CHECK));
+ return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
} else {
//褰撲簨浜�
PartyInfo partyInfo = new PartyInfo();
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
index 9fd9bd0..8836826 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
@@ -24,7 +24,7 @@
* @param pageNum 椤电爜
* @return 鍒嗛〉瀹炰綋
*/
- Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum);
+ Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status);
/**
* 璇诲彇excel鏂囦欢鍔ㄦ�佸姞杞芥枃浠�
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index 5cf17d1..79b05f0 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -49,11 +49,11 @@
@Override
- public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum) {
+ public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status) {
Page<StoreInfo> storeInfoPage = new Page<>();
storeInfoPage.setSize(pageSize);
storeInfoPage.setCurrent(pageNum);
- Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword);
+ Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword,status);
page.getRecords().forEach(x -> x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
return page;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
index 16d4b75..fac6560 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java
@@ -1,6 +1,9 @@
package com.ycl.vo.casePool;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.time.LocalDateTime;
@Data
public class BaseCaseVO {
@@ -13,4 +16,7 @@
private String grade;
private String street;
private String community;
+
+ @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime alarmTime;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
index 56cb2bc..ac1bcea 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
@@ -69,7 +69,7 @@
@TableField("store_score")
private Double storeScore;
- @ApiModelProperty("闂ㄥ簵绉垎")
+ @ApiModelProperty("瑙嗛鐐逛綅")
@TableField(" relation_video")
private String relationVideo;
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index df229d3..740b16c 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -238,7 +238,8 @@
t4.pic_data,
t5.`name` as grade,
t6.`name` as street,
- t7.`name` as community
+ t7.`name` as community,
+ t1.alarm_time as alarmTime
FROM
ums_base_case t1
LEFT JOIN ums_violations t2 ON t1.id = t2.id
diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index abc4a0c..1142b20 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -25,6 +25,9 @@
<if test="keyword!=null and keyword!=''">
t1.store_name LIKE CONCAT('%', #{keyword}, '%')
</if>
+ <if test="status!=null and status!='' and status!='0' ">
+ t1.status = #{status}
+ </if>
</where>
order by t1.id desc
</select>
--
Gitblit v1.8.0