From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 16 十二月 2023 17:08:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java | 34 ++++++++++------
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 26 +++++++------
ycl-platform/src/main/resources/application-prod.yml | 2
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 29 ++++++++++++--
ycl-platform/src/main/resources/application-online.yml | 2
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java | 5 ++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 4 +-
ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java | 5 ++
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java | 4 +-
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 4 +-
10 files changed, 78 insertions(+), 37 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 3082a29..5adf61a 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -44,6 +44,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
@@ -133,7 +134,7 @@
@ApiOperation(value = "鏌ヨ杩濊杩濆缓")
@GetMapping("/query")
@ApiImplicitParams({
- @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0-寰呭鐞�1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊5绔嬫6璋冨害7澶勭疆8鏍告煡9缁撴)", dataType = "Integer"),
+ @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)", dataType = "String"),
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer"),
@ApiImplicitParam(name = "resource", value = "1 瑙嗛,2 鎵嬪姩", dataType = "Integer"),
@ApiImplicitParam(name = "code", dataType = "String"),
@@ -147,7 +148,7 @@
})
public CommonResult searchViolation(@RequestParam Integer size,
@RequestParam Integer current,
- @RequestParam(required = false) Integer state,
+ @RequestParam(required = false) String state,
@RequestParam Integer type,
@RequestParam(required = false) Integer resource,
@RequestParam(required = false) String code,
@@ -161,10 +162,30 @@
@RequestParam(required = false) Integer videoId) {
Page<Object> queryList;
+ // 澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)
+ List<Integer> stateList = new ArrayList<>();
+ switch (state){
+ case "wait":
+ stateList.add(0);
+ break;
+ case "handle":
+ stateList.add(5);
+ stateList.add(6);
+ stateList.add(7);
+ stateList.add(8);
+ break;
+ case "finish":
+ stateList.add(1);
+ stateList.add(2);
+ stateList.add(3);
+ stateList.add(4);
+ stateList.add(9);
+ break;
+ }
if (type == 1) {
- queryList = baseCaseService.listViolationsPage(current, size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
+ queryList = baseCaseService.listViolationsPage(current, size, stateList, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
} else if (type == 2) {
- queryList = baseCaseService.listIllegalBuilding(current, size, state, resource);
+ queryList = baseCaseService.listIllegalBuilding(current, size, stateList, resource);
} else {
return CommonResult.failed("bad request url");
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
index 94f9a67..b9faedc 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -27,9 +27,9 @@
* @since 2022-09-24
*/
public interface BaseCaseMapper extends BaseMapper<BaseCase> {
- Page<CasePoolViolationVO> listViolationsPage(Page page, Integer state, Integer type, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
+ Page<CasePoolViolationVO> listViolationsPage(Page page, List<Integer> state, Integer type, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
- Page<CasePoolIllegalBuildingVO> listIllegalBuildingsPage(Page page, Integer state, Integer type, Integer resource);
+ Page<CasePoolIllegalBuildingVO> listIllegalBuildingsPage(Page page, List<Integer> state, Integer type, Integer resource);
BaseCase selectCondMap(Map map);
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index 22ad078..cbb2530 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -39,9 +39,9 @@
*/
String uploadEvent(Long caseId);
- Page listViolationsPage(Integer size, Integer current, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
+ Page listViolationsPage(Integer size, Integer current, List<Integer> state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
- Page listIllegalBuilding(Integer current, Integer size, Integer state, Integer resource);
+ Page listIllegalBuilding(Integer current, Integer size, List<Integer> state, Integer resource);
Boolean saveViolationCase(ViolationParam violationParam, Long id);
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index c731f80..05b8a2e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -173,7 +173,7 @@
}
@Override
- public Page listViolationsPage(Integer current, Integer size, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
+ public Page listViolationsPage(Integer current, Integer size, List<Integer> state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
Integer type = 01;
Integer hours = 60;
Integer day = 24;
@@ -198,7 +198,7 @@
}
@Override
- public Page listIllegalBuilding(Integer current, Integer size, Integer state, Integer resource) {
+ public Page listIllegalBuilding(Integer current, Integer size, List<Integer> state, Integer resource) {
Integer type = 02;
Page page = new Page<>().setCurrent(current).setSize(size);
return baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource);
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
index 8ce0c7f..16b65d6 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingToken.java
@@ -37,17 +37,17 @@
private DingConfig dingConfig;
- private String getToken() {
+ private String getToken() {
//璋冪敤API
getTokenClient = executableClient.newGetClient(GET_TOKEN);
//璁剧疆鍙傛暟
- getTokenClient.addParameter("appkey", dingConfig.getAppKey());
+ getTokenClient.addParameter("appkey", dingConfig.getAppKey());
getTokenClient.addParameter("appsecret", dingConfig.getAppSecret());
String apiResult = getTokenClient.get();
return parsingResult(apiResult);
}
- private String getTiker(String accToken) {
+ private String getTiker(String accToken) {
//璋冪敤API
PostClient postClient = executableClient.newPostClient(GET_TIKER);
//璁剧疆鍙傛暟
@@ -91,16 +91,24 @@
// runAction();
}
}
- @Scheduled(cron ="0 0/2 * * * ? ")
+
+ @Value("${spring.profiles.active}")
+ private String env;
+
+ @Scheduled(cron ="0 0/2 * * * ? ")
+// @Scheduled(cron = "0/1 * * * * ?") // 姣忕鎵ц
public void runAction() {
- //gettoken
- String getToken = getToken();
- //jsApi
- String jsapiToken = getTiker(getToken);
- //瀛樺偍鍒皉edis
- JSONObject dingObj = new JSONObject();
- dingObj.put("token", getToken);
- dingObj.put("jsApiTiker", jsapiToken);
- redisTemplate.opsForValue().set("ding", dingObj.toJSONString(), 2L, TimeUnit.HOURS);
+// System.out.println("鐜锛�" + env);
+ if ("online".equals(env)) {
+ //gettoken
+ String getToken = getToken();
+ //jsApi
+ String jsapiToken = getTiker(getToken);
+ //瀛樺偍鍒皉edis
+ JSONObject dingObj = new JSONObject();
+ dingObj.put("token", getToken);
+ dingObj.put("jsApiTiker", jsapiToken);
+ redisTemplate.opsForValue().set("ding", dingObj.toJSONString(), 2L, TimeUnit.HOURS);
+ }
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
index a756064..4427120 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolIllegalBuildingVO.java
@@ -70,4 +70,9 @@
*/
@ApiModelProperty(value = "杩濆缓鏉愭枡", dataType = "String")
private String materials;
+ /**
+ * 鐘舵��
+ */
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer state;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
index 63e873d..2d556c4 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/casePool/CasePoolViolationVO.java
@@ -78,4 +78,9 @@
@ApiModelProperty(value = "鍏抽棴鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime closeTime;
+ /**
+ * 鐘舵��
+ */
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer state;
}
diff --git a/ycl-platform/src/main/resources/application-online.yml b/ycl-platform/src/main/resources/application-online.yml
index f86f29e..e1181ec 100644
--- a/ycl-platform/src/main/resources/application-online.yml
+++ b/ycl-platform/src/main/resources/application-online.yml
@@ -1,5 +1,5 @@
server:
- port: 8084
+ port: 8082
tomcat:
uri-encoding: UTF-8
servlet:
diff --git a/ycl-platform/src/main/resources/application-prod.yml b/ycl-platform/src/main/resources/application-prod.yml
index ce662ad..716eb0e 100644
--- a/ycl-platform/src/main/resources/application-prod.yml
+++ b/ycl-platform/src/main/resources/application-prod.yml
@@ -24,7 +24,7 @@
spring:
redis:
database: 0
- host: 127.0.0.1
+ host: 10.110.247.1
port: 6380
password: Q(yNR2x^%v@HV
jedis:
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 472f35e..aebe2af 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -55,7 +55,8 @@
t5.region_name as street,
ubc.site,
ubc.alarm_time,
- ubc.close_time
+ ubc.close_time,
+ ubc.state
FROM
`ums_base_case` AS ubc
JOIN ums_violations AS uv ON ubc.id = uv.id
@@ -63,11 +64,11 @@
LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
<where>
- <if test="state!=null and state!=6">
- ubc.state=#{state}
- </if>
- <if test="state!=null and state==6">
- ubc.state >=#{state}
+ <if test=" state != null and state.size() > 0">
+ AND ubc.state in
+ <foreach collection="state" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
@@ -115,18 +116,19 @@
uib.building_width,
uib.building_length,
uib.building_area,
- uib.materials
+ uib.materials,
+ ubc.state
FROM
`ums_base_case` AS ubc
left JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
left JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
left JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
<where>
- <if test="state!=null and state!=6">
- ubc.state=#{state}
- </if>
- <if test="state!=null and state==6">
- ubc.state >=#{state}
+ <if test=" state != null and state.size() > 0">
+ AND ubc.state in
+ <foreach collection="state" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
--
Gitblit v1.8.0