From fdad0fb55be953a928b9276239759ade18050e70 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 28 九月 2023 18:50:39 +0800
Subject: [PATCH] 油烟
---
ycl-platform/src/main/java/com/ycl/service/smoke/IOdsInTimeService.java | 2
ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java | 7 +-
ycl-platform/src/main/resources/application-dev.yml | 29 +++++----
ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java | 2
ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java | 48 +++++++++++++++-
ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java | 8 ++
ycl-platform/src/main/java/com/ycl/service/smoke/IOdsCustomerService.java | 2
ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java | 16 +++++
ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java | 17 +++++
9 files changed, 108 insertions(+), 23 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java b/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java
index 114bc27..82774ef 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java
@@ -1,22 +1,64 @@
package com.ycl.controller.smoke;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
+import com.ycl.api.CommonPage;
+import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
+import com.ycl.entity.smoke.OdsCustomer;
+import com.ycl.entity.smoke.OdsInTime;
+import com.ycl.service.smoke.IOdsCustomerService;
import com.ycl.service.smoke.IOdsInTimeService;
+import com.ycl.vo.store.StoreInfoVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/smoker")
-@Api(tags = "瑙嗛璧勬簮绠＄悊")
+@Api(tags = "娌圭儫绠＄悊绠＄悊")
public class SmokeController extends BaseController {
IOdsInTimeService inTimeService;
+ IOdsCustomerService customerService;
+
@Autowired
public void setInTimeService(IOdsInTimeService inTimeService) {
this.inTimeService = inTimeService;
}
+
+ @Autowired
+ public void setCustomerService(IOdsCustomerService customerService) {
+ this.customerService = customerService;
+ }
+
+ @ApiOperation("鑾峰彇鎵�灞炲崟浣�")
+ @RequestMapping(value = "/customer/list", method = RequestMethod.GET)
+ @ResponseBody
+ @LogSave(operationType = "娌圭儫妯″潡", contain = "鑾峰彇鎵�灞炲崟浣�")
+ public CommonResult<CommonPage<OdsCustomer>> findCustomerList(@RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+ Page<OdsCustomer> customerPage = customerService.findList(keyword, pageSize, pageNum);
+ return CommonResult.success(CommonPage.restPage(customerPage));
+ }
+
+ @ApiOperation("鏌ヨ瀹炴椂鏁版嵁")
+ @RequestMapping(value = "/inTime/list", method = RequestMethod.GET)
+ @ResponseBody
+ @LogSave(operationType = "娌圭儫妯″潡", contain = "鏌ヨ瀹炴椂鏁版嵁")
+ public CommonResult<CommonPage<OdsInTime>> findInTimeList(@RequestParam(value = "owner", required = false) String owner,
+ @RequestParam(value = "onlineStatus", required = false) String onlineStatus,
+ @RequestParam(value = "status", required = false) String status,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "type", required = false) String type,
+ @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+ Page<OdsInTime> inTimePage = inTimeService.findList(owner, onlineStatus, startTime, endTime, type, status, pageSize, pageNum);
+ return CommonResult.success(CommonPage.restPage(inTimePage));
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsCustomerService.java b/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsCustomerService.java
index 0ac3ec0..11a3a75 100644
--- a/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsCustomerService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsCustomerService.java
@@ -1,5 +1,6 @@
package com.ycl.service.smoke;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.smoke.OdsCustomer;
@@ -13,4 +14,5 @@
*/
public interface IOdsCustomerService extends IService<OdsCustomer> {
+ Page<OdsCustomer> findList(String keyword, Integer pageSize, Integer pageNum);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsInTimeService.java b/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsInTimeService.java
index 0752322..1c3e7ab 100644
--- a/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsInTimeService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/smoke/IOdsInTimeService.java
@@ -1,5 +1,6 @@
package com.ycl.service.smoke;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.smoke.OdsInTime;
@@ -13,4 +14,5 @@
*/
public interface IOdsInTimeService extends IService<OdsInTime> {
+ Page<OdsInTime> findList(String owner, String onlineStatus, String startTime, String endTime, String type, String status, Integer pageSize, Integer pageNum);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java
index 131b768..2520424 100644
--- a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java
@@ -1,7 +1,12 @@
package com.ycl.service.smoke.impl;
+import cn.hutool.core.util.StrUtil;
+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.ycl.entity.smoke.OdsCustomer;
+import com.ycl.entity.user.UmsRole;
import com.ycl.mapper.smoke.OdsCustomerMapper;
import com.ycl.service.smoke.IOdsCustomerService;
import org.springframework.stereotype.Service;
@@ -17,4 +22,15 @@
@Service
public class OdsCustomerServiceImpl extends ServiceImpl<OdsCustomerMapper, OdsCustomer> implements IOdsCustomerService {
+ @Override
+ public Page<OdsCustomer> findList(String keyword, Integer pageSize, Integer pageNum) {
+ Page<OdsCustomer> page = new Page<>(pageNum, pageSize);
+ QueryWrapper<OdsCustomer> wrapper = new QueryWrapper<>();
+ LambdaQueryWrapper<OdsCustomer> lambda = wrapper.lambda();
+ if (StrUtil.isNotEmpty(keyword)) {
+ lambda.like(OdsCustomer::getName, keyword);
+ }
+
+ return this.page(page, wrapper);
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java
index d83e11f..2b9269d 100644
--- a/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsInTimeServiceImpl.java
@@ -1,6 +1,11 @@
package com.ycl.service.smoke.impl;
+import cn.hutool.core.util.StrUtil;
+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.ycl.entity.smoke.OdsCustomer;
import com.ycl.entity.smoke.OdsInTime;
import com.ycl.mapper.smoke.OdsInTimeMapper;
import com.ycl.service.smoke.IOdsInTimeService;
@@ -17,4 +22,16 @@
@Service
public class OdsInTimeServiceImpl extends ServiceImpl<OdsInTimeMapper, OdsInTime> implements IOdsInTimeService {
+ @Override
+ public Page<OdsInTime> findList(String owner, String onlineStatus, String startTime, String endTime, String type, String status, Integer pageSize, Integer pageNum) {
+ Page<OdsInTime> page = new Page<>(pageNum, pageSize);
+ QueryWrapper<OdsInTime> wrapper = new QueryWrapper<>();
+ LambdaQueryWrapper<OdsInTime> lambda = wrapper.lambda();
+ if (StrUtil.isNotEmpty(keyword)) {
+ lambda.like(OdsInTime::getName, keyword);
+ }
+
+ return this.page(page, wrapper);
+
+ }
}
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index e1181ec..bd06cc6 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -11,9 +11,9 @@
groupName: sczhzf
soTimeout: 1500
connectTimeout: 600
- trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
+ trackerList: #TrackerList鍙傛暟,鏀寔澶氫釜
- 140.143.152.226:22122
- -
+
cfg:
res: d://resources
media-res: 140.143.152.226/media/
@@ -24,9 +24,9 @@
spring:
redis:
database: 0
- host: 127.0.0.1
- port: 6380
- password: Q(yNR2x^%v@HV
+ host: 42.193.1.25
+ port: 6379
+ password: ycl2018
jedis:
pool:
max-active: 8
@@ -35,9 +35,9 @@
timeout: 0
datasource:
- url: jdbc:mysql://10.110.247.252:3306/sccg?characterEncoding=utf-8
- username: toor
- password: v6VGHAzXEu$zF7
+ url: jdbc:mysql://42.193.1.25:3306/sccg?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+ username: root
+ password: 321$YcYl@1970!
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
@@ -54,6 +54,7 @@
poolPreparedStatements: true
maxOpenPreparedStatements: 20
+
e-mail:
sendHost: smtp.qq.com
username: 1723292425@qq.com
@@ -66,18 +67,18 @@
url: https://mas.10086.cn
videoPoint:
- url: http://172.28.194.180:7901
- port: 7901
+ url: http://183.245.159.161:8281
+ port: 8281
userName: suichang
passWord: a12345677
ip: 10.10.10.10
aliyun:
oss:
- endpoint: http://oss-cn-zjls-lszwy-d01-a.ops.zjlscloud.com
- keyId: Tkf72Q1gdzETsZf6
- keySecret: tRk39S6B1kSGARRdS4DF6jxr5nBYj5
- bucketName: zhzfptoss
+ endpoint: https://oss-cn-chengdu.aliyuncs.com
+ keyId: LTAI5tRpMjypcziJ2WAWEKsV
+ keySecret: U7CPi1JqOWvTbdLR99duJ8ev3tcjRp
+ bucketName: upload-bzh-new
#涓撴湁閽夐拤鍙傛暟
zzding :
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java
index 76eff33..41aee70 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsInTime.java
@@ -1,11 +1,14 @@
package com.ycl.smoke.entity;
import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
+import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@@ -112,8 +115,7 @@
/**
* 鐘舵��
- 锛圢ORMAL姝ｅ父銆丄LARM棰勮銆丒XCESS瓒呮爣銆丏OWN绂荤嚎銆丱FF寮傚父绂荤嚎锛�
-
+ * 锛圢ORMAL姝ｅ父銆丄LARM棰勮銆丒XCESS瓒呮爣銆丏OWN绂荤嚎銆丱FF寮傚父绂荤嚎锛�
*/
@TableField("status")
@JsonProperty("Status")
@@ -245,4 +247,6 @@
@JsonProperty("StatusOfRecord")
private String statusOfRecord;
+ @TableField("modify_time")
+ private LocalDateTime modifyTime;
}
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java
index 6c3fe64..9e08aaa 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/task/CityUploadTask.java
@@ -36,7 +36,7 @@
CityPlatformService cityPlatformService;
- @Scheduled(cron = "0 */1 * * * ?") // 姣�5鍒嗛挓鎵ц
+ @Scheduled(cron = "0 */5 * * * ?") // 姣�5鍒嗛挓鎵ц
public void upload() {
QueryWrapper<BaseCase> wrapperWc = new QueryWrapper<>();
wrapperWc.lambda().eq(BaseCase::getState, 10);
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
index d3c8abb..db0e45e 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
+++ b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
@@ -185,8 +185,8 @@
}
- @Scheduled(cron = "0 0 1 * * ?") // 姣忓ぉ闆剁偣鎵ц
-// @Scheduled(cron = "0/1 * * * * ?") // 姣忕鎵ц
+ // @Scheduled(cron = "0 0 1 * * ?") // 姣忓ぉ闆剁偣鎵ц
+ @Scheduled(cron = "0 */5 * * * ?") // 姣�5鍒嗛挓鎵ц
public void listDataIntime() {
try {
DataIntimeParamDto paramDto = DataIntimeParamDto.builder().build();
@@ -199,7 +199,8 @@
List<OdsInTime> list = dataIntimeResponseDto.getContent();
list.forEach(o -> {
try {
- inTimeService.save(o);
+ o.setModifyTime(LocalDateTime.now());
+ inTimeService.saveOrUpdate(o);
} catch (Exception ex) {
System.out.printf(ex.getMessage());
}
--
Gitblit v1.8.0