From ad3fa87564cb16ffb1a310119232dc420c90b0fe Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Wed, 12 May 2021 14:43:58 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=9B=AD=E5=8C=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=91=84=E5=83=8F=E5=A4=B4=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/logistics/api/DebugController.java | 32 +++--- .../ccsens/logistics/bean/dto/HttpDto.java | 22 ++++ .../bean/po/LogisticsParkEquipment.java | 11 ++ .../po/LogisticsParkEquipmentExample.java | 70 ++++++++++++ .../ccsens/logistics/service/HttpService.java | 106 ++++++++++++++++++ .../logistics/service/IHttpService.java | 13 +++ .../LogisticsParkEquipmentMapper.xml | 28 ++++- 7 files changed, 263 insertions(+), 19 deletions(-) create mode 100644 logistics/src/main/java/com/ccsens/logistics/bean/dto/HttpDto.java create mode 100644 logistics/src/main/java/com/ccsens/logistics/service/HttpService.java create mode 100644 logistics/src/main/java/com/ccsens/logistics/service/IHttpService.java diff --git a/logistics/src/main/java/com/ccsens/logistics/api/DebugController.java b/logistics/src/main/java/com/ccsens/logistics/api/DebugController.java index 9de023ec..d16eb76e 100644 --- a/logistics/src/main/java/com/ccsens/logistics/api/DebugController.java +++ b/logistics/src/main/java/com/ccsens/logistics/api/DebugController.java @@ -5,6 +5,8 @@ import com.ccsens.logistics.bean.po.LogisticsCarRecord; import com.ccsens.logistics.bean.po.LogisticsEnvironmentRecord; import com.ccsens.logistics.persist.dao.LogisticsCarRecordDao; import com.ccsens.logistics.persist.dao.LogisticsEnvironmentRecordDao; +import com.ccsens.logistics.service.HttpService; +import com.ccsens.logistics.service.IHttpService; import com.ccsens.util.JsonResponse; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; @@ -27,26 +29,28 @@ public class DebugController { private LogisticsCarRecordDao carRecordDao; @Resource private Snowflake snowflake; + @Resource + private IHttpService iHttpService; @ApiOperation(value = "/测试添加假数据",notes = "") @ApiImplicitParams({ }) @RequestMapping(value="",produces = {"application/json;charset=UTF-8"}) public JsonResponse getSmsCode(HttpServletRequest request) throws Exception { - Long currentTime = 1620632535000L; - for (int i = 0; i < 100; i++) { - Byte carType = Math.random()*10 < 5 ? (byte)0 :(byte) 1; - LogisticsCarRecord logisticsCarRecord = new LogisticsCarRecord(); - logisticsCarRecord.setId(snowflake.nextId()); - logisticsCarRecord.setCarWeight(RandomUtils.nextLong(1,9)); - logisticsCarRecord.setLicensePlate("未知"); - logisticsCarRecord.setCarType(carType); - logisticsCarRecord.setInOut(carType); - logisticsCarRecord.setRecordTime(currentTime); - currentTime = currentTime-86400000; - carRecordDao.insertSelective(logisticsCarRecord); - } - +// Long currentTime = 1620632535000L; +// for (int i = 0; i < 100; i++) { +// Byte carType = Math.random()*10 < 5 ? (byte)0 :(byte) 1; +// LogisticsCarRecord logisticsCarRecord = new LogisticsCarRecord(); +// logisticsCarRecord.setId(snowflake.nextId()); +// logisticsCarRecord.setCarWeight(RandomUtils.nextLong(1,9)); +// logisticsCarRecord.setLicensePlate("未知"); +// logisticsCarRecord.setCarType(carType); +// logisticsCarRecord.setInOut(carType); +// logisticsCarRecord.setRecordTime(currentTime); +// currentTime = currentTime-86400000; +// carRecordDao.insertSelective(logisticsCarRecord); +// } + iHttpService.getTemperatureAndHumidity(); return JsonResponse.newInstance().ok("测试"); } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/HttpDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/HttpDto.java new file mode 100644 index 00000000..803d9b24 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/HttpDto.java @@ -0,0 +1,22 @@ +package com.ccsens.logistics.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class HttpDto { + + @Data + @ApiModel("温湿度登录接口") + public static class Login{ + @ApiModelProperty("账号") + private String loginName; + @ApiModelProperty("密码") + private String password; + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java index 6e8d8d8d..969d1d0a 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipment.java @@ -14,6 +14,8 @@ public class LogisticsParkEquipment implements Serializable { private Long parkId; + private String equipmentLocation; + private Date createdAt; private Date updatedAt; @@ -62,6 +64,14 @@ public class LogisticsParkEquipment implements Serializable { this.parkId = parkId; } + public String getEquipmentLocation() { + return equipmentLocation; + } + + public void setEquipmentLocation(String equipmentLocation) { + this.equipmentLocation = equipmentLocation == null ? null : equipmentLocation.trim(); + } + public Date getCreatedAt() { return createdAt; } @@ -97,6 +107,7 @@ public class LogisticsParkEquipment implements Serializable { sb.append(", equipmentNumber=").append(equipmentNumber); sb.append(", equipmentType=").append(equipmentType); sb.append(", parkId=").append(parkId); + sb.append(", equipmentLocation=").append(equipmentLocation); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java index ad3cd99c..c4febe80 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsParkEquipmentExample.java @@ -425,6 +425,76 @@ public class LogisticsParkEquipmentExample { return (Criteria) this; } + public Criteria andEquipmentLocationIsNull() { + addCriterion("equipment_location is null"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationIsNotNull() { + addCriterion("equipment_location is not null"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationEqualTo(String value) { + addCriterion("equipment_location =", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationNotEqualTo(String value) { + addCriterion("equipment_location <>", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationGreaterThan(String value) { + addCriterion("equipment_location >", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationGreaterThanOrEqualTo(String value) { + addCriterion("equipment_location >=", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationLessThan(String value) { + addCriterion("equipment_location <", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationLessThanOrEqualTo(String value) { + addCriterion("equipment_location <=", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationLike(String value) { + addCriterion("equipment_location like", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationNotLike(String value) { + addCriterion("equipment_location not like", value, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationIn(List values) { + addCriterion("equipment_location in", values, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationNotIn(List values) { + addCriterion("equipment_location not in", values, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationBetween(String value1, String value2) { + addCriterion("equipment_location between", value1, value2, "equipmentLocation"); + return (Criteria) this; + } + + public Criteria andEquipmentLocationNotBetween(String value1, String value2) { + addCriterion("equipment_location not between", value1, value2, "equipmentLocation"); + return (Criteria) this; + } + public Criteria andCreatedAtIsNull() { addCriterion("created_at is null"); return (Criteria) this; diff --git a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java new file mode 100644 index 00000000..f437be2a --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java @@ -0,0 +1,106 @@ +package com.ccsens.logistics.service; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.ccsens.logistics.bean.dto.HttpDto; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.PropUtil; +import com.ccsens.util.RestTemplateUtil; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.Header; +import org.apache.http.HttpResponse; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.apache.http.HttpEntity; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Map; + +/** + * @author 马 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class HttpService implements IHttpService{ + + @Override + public void getTemperatureAndHumidity() { + try { + HttpDto.Login login = new HttpDto.Login(); + login.setLoginName("jnrstest"); + login.setPassword("jnrstest321"); + //调取登录接口 获取userId + String userId = getUserId(login); + String body = getBody(userId); + + }catch (Exception e){ + e.printStackTrace(); + } + + } + + /** + * 温湿度登录接口 获取设备的userId 调用其他接口 + * @param login 账号密码 + * @return userId + */ + public String getUserId(HttpDto.Login login){ + String requestUrl = "http://www.0531yun.cn/wsjc/app/Login"; + String s = RestTemplateUtil.postBody(requestUrl, login); + JsonResponse a = JSONObject.parseObject(s, JsonResponse.class); + JSONObject data = a.getData(); + String userId = data.getString("userId"); + return userId; + } + + + + public static String getBody(String userId) throws IOException { + try { + String url = "http://www.0531yun.cn/app/GetUserDeviceGroups"; + HttpGet get = new HttpGet(url); + get.setHeader("userId",userId); + HttpClient httpClient = HttpClients.createDefault(); + HttpResponse response = httpClient.execute(get); + return getResult(response); + } catch (ClientProtocolException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + public static String getResult(HttpResponse response) throws IOException { + // 获取状态码 + int code = response.getStatusLine().getStatusCode(); + System.out.println(code); + // 获取body + HttpEntity entity = response.getEntity(); + String body = EntityUtils.toString(entity); + System.out.println(body); + // 获取头信息 + Header[] allHeaders = response.getAllHeaders(); + String headers = Arrays.toString(allHeaders); + System.out.println(headers); + + // 返回body + return body; + } + + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/IHttpService.java b/logistics/src/main/java/com/ccsens/logistics/service/IHttpService.java new file mode 100644 index 00000000..4e14506f --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/IHttpService.java @@ -0,0 +1,13 @@ +package com.ccsens.logistics.service; + +/** + * @author 马 + */ +public interface IHttpService { + + /** + * 获取温度和湿度 + */ + void getTemperatureAndHumidity(); + +} diff --git a/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml b/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml index 96520adf..7d477b5c 100644 --- a/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml +++ b/logistics/src/main/resources/mapper_raw/LogisticsParkEquipmentMapper.xml @@ -7,6 +7,7 @@ + @@ -70,7 +71,8 @@ - id, name, equipment_number, equipment_type, park_id, created_at, updated_at, rec_status + id, name, equipment_number, equipment_type, park_id, equipment_location, created_at, + updated_at, rec_status SELECT ir.id AS id, - ir.num_value AS numValue, + ir.ir.max_t AS numValue, ir.max_tx AS maxTx, ir.max_ty AS maxTy, ir.image_data AS imageData From 6268d38f0096a0813e1f5195eb4f4d861038d8e0 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Wed, 12 May 2021 15:54:52 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml index e1588cfa..8d08e7a6 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml @@ -5,7 +5,7 @@ select @@ -107,13 +108,13 @@ insert into t_logistics_environment_record (id, num_value, num_type, - equipment_id, warehouse_id, record_time, - is_alarm, created_at, updated_at, - rec_status) + equipment_id, warehouse_id, equipment_num, + record_time, is_alarm, created_at, + updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{numValue,jdbcType=DECIMAL}, #{numType,jdbcType=TINYINT}, - #{equipmentId,jdbcType=BIGINT}, #{warehouseId,jdbcType=BIGINT}, #{recordTime,jdbcType=BIGINT}, - #{isAlarm,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) + #{equipmentId,jdbcType=BIGINT}, #{warehouseId,jdbcType=BIGINT}, #{equipmentNum,jdbcType=VARCHAR}, + #{recordTime,jdbcType=BIGINT}, #{isAlarm,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) insert into t_logistics_environment_record @@ -133,6 +134,9 @@ warehouse_id, + + equipment_num, + record_time, @@ -165,6 +169,9 @@ #{warehouseId,jdbcType=BIGINT}, + + #{equipmentNum,jdbcType=VARCHAR}, + #{recordTime,jdbcType=BIGINT}, @@ -206,6 +213,9 @@ warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + + equipment_num = #{record.equipmentNum,jdbcType=VARCHAR}, + record_time = #{record.recordTime,jdbcType=BIGINT}, @@ -233,6 +243,7 @@ num_type = #{record.numType,jdbcType=TINYINT}, equipment_id = #{record.equipmentId,jdbcType=BIGINT}, warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + equipment_num = #{record.equipmentNum,jdbcType=VARCHAR}, record_time = #{record.recordTime,jdbcType=BIGINT}, is_alarm = #{record.isAlarm,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -257,6 +268,9 @@ warehouse_id = #{warehouseId,jdbcType=BIGINT}, + + equipment_num = #{equipmentNum,jdbcType=VARCHAR}, + record_time = #{recordTime,jdbcType=BIGINT}, @@ -281,6 +295,7 @@ num_type = #{numType,jdbcType=TINYINT}, equipment_id = #{equipmentId,jdbcType=BIGINT}, warehouse_id = #{warehouseId,jdbcType=BIGINT}, + equipment_num = #{equipmentNum,jdbcType=VARCHAR}, record_time = #{recordTime,jdbcType=BIGINT}, is_alarm = #{isAlarm,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, diff --git a/logistics/src/main/resources/mapper_raw/LogisticsHeatImagingRecordMapper.xml b/logistics/src/main/resources/mapper_raw/LogisticsHeatImagingRecordMapper.xml index 97b2e83d..ef06f331 100644 --- a/logistics/src/main/resources/mapper_raw/LogisticsHeatImagingRecordMapper.xml +++ b/logistics/src/main/resources/mapper_raw/LogisticsHeatImagingRecordMapper.xml @@ -11,6 +11,7 @@ + @@ -78,7 +79,7 @@ id, num_value, num_type, max_t, max_tx, max_ty, record_time, equipment_id, warehouse_id, - created_at, updated_at, rec_status + equipment_num, created_at, updated_at, rec_status image_data @@ -135,13 +136,13 @@ insert into t_logistics_heat_imaging_record (id, num_value, num_type, max_t, max_tx, max_ty, record_time, equipment_id, warehouse_id, - created_at, updated_at, rec_status, - image_data) + equipment_num, created_at, updated_at, + rec_status, image_data) values (#{id,jdbcType=BIGINT}, #{numValue,jdbcType=DECIMAL}, #{numType,jdbcType=TINYINT}, #{maxT,jdbcType=DECIMAL}, #{maxTx,jdbcType=VARCHAR}, #{maxTy,jdbcType=VARCHAR}, #{recordTime,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, #{warehouseId,jdbcType=BIGINT}, - #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, - #{imageData,jdbcType=LONGVARCHAR}) + #{equipmentNum,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}, #{imageData,jdbcType=LONGVARCHAR}) insert into t_logistics_heat_imaging_record @@ -173,6 +174,9 @@ warehouse_id, + + equipment_num, + created_at, @@ -214,6 +218,9 @@ #{warehouseId,jdbcType=BIGINT}, + + #{equipmentNum,jdbcType=VARCHAR}, + #{createdAt,jdbcType=TIMESTAMP}, @@ -264,6 +271,9 @@ warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + + equipment_num = #{record.equipmentNum,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -292,6 +302,7 @@ record_time = #{record.recordTime,jdbcType=BIGINT}, equipment_id = #{record.equipmentId,jdbcType=BIGINT}, warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + equipment_num = #{record.equipmentNum,jdbcType=VARCHAR}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT}, @@ -311,6 +322,7 @@ record_time = #{record.recordTime,jdbcType=BIGINT}, equipment_id = #{record.equipmentId,jdbcType=BIGINT}, warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, + equipment_num = #{record.equipmentNum,jdbcType=VARCHAR}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -345,6 +357,9 @@ warehouse_id = #{warehouseId,jdbcType=BIGINT}, + + equipment_num = #{equipmentNum,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -370,6 +385,7 @@ record_time = #{recordTime,jdbcType=BIGINT}, equipment_id = #{equipmentId,jdbcType=BIGINT}, warehouse_id = #{warehouseId,jdbcType=BIGINT}, + equipment_num = #{equipmentNum,jdbcType=VARCHAR}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, @@ -386,6 +402,7 @@ record_time = #{recordTime,jdbcType=BIGINT}, equipment_id = #{equipmentId,jdbcType=BIGINT}, warehouse_id = #{warehouseId,jdbcType=BIGINT}, + equipment_num = #{equipmentNum,jdbcType=VARCHAR}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} From 06a0c4a86e92cd0b199aea239faa573ec936a8a5 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Thu, 13 May 2021 16:46:46 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E6=B9=BF=E5=BA=A6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/logistics/bean/dto/MbpsDto.java | 4 + .../com/ccsens/logistics/bean/vo/MbpsVo.java | 6 +- .../dao/LogisticsEnvironmentRecordDao.java | 12 +-- .../ccsens/logistics/service/HttpService.java | 2 +- .../ccsens/logistics/service/MbpsService.java | 28 ++++++- .../LogisticsEnvironmentRecordDao.xml | 78 +++++++++++-------- 6 files changed, 82 insertions(+), 48 deletions(-) diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java index c1cd0804..9f0e33ee 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java @@ -25,6 +25,8 @@ public class MbpsDto { @NotNull(message = "请选择查询类型") @ApiModelProperty("查询类型(0-按天,1-按周,2-按月,3-按年)") private Byte queryType; + @ApiModelProperty("查询的天数") + private Integer queryOfDay = 10; @ApiModelProperty("开始时间") private Long startTime; @ApiModelProperty("结束时间") @@ -41,6 +43,8 @@ public class MbpsDto { private Long startTime; @ApiModelProperty("结束时间") private Long endTime; + @ApiModelProperty("查询的几个小时的数据") + private Integer queryOfDay = 5; } @Data diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/MbpsVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/MbpsVo.java index ec094f4e..c5ee311f 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/vo/MbpsVo.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/MbpsVo.java @@ -86,18 +86,16 @@ public class MbpsVo { @Data @ApiModel("温度变化") public static class Temps{ - @JsonFormat(pattern = "HH:mm:ss") @ApiModelProperty("时间") - private Date time; + private String time; @ApiModelProperty("温度") private BigDecimal temp; } @Data @ApiModel("湿度变化") public static class Humiditys{ - @JsonFormat(pattern = "HH:mm:ss") @ApiModelProperty("时间") - private Date time; + private String time; @ApiModelProperty("湿度") private BigDecimal humidity; } diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java index 50c70a63..7ade33c1 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java @@ -16,20 +16,20 @@ public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecor /** * 查询温度变化 * @param warehouseId 仓库id - * @param startTime 开始时间 - * @param endTime 结束时间 + * @param countArr 需要查询几天的数据 + * @param nowDate 现在的时间 * @return 温度列表 */ - List selTempByTime(@Param("warehouseId") Long warehouseId,@Param("startTime") Long startTime,@Param("endTime") Long endTime); + List selTempByTime(@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); /** * 查询湿度变化 * @param warehouseId 仓库id - * @param startTime 开始时间 - * @param endTime 结束时间 + * @param countArr 需要查询几天的数据 + * @param nowDate 现在的时间 * @return 湿度列表 */ - List selHumidityByTime(@Param("warehouseId") Long warehouseId,@Param("startTime") Long startTime,@Param("endTime") Long endTime); + List selHumidityByTime(@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); /** * 是否有火灾 diff --git a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java index f801a96b..4278513c 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java @@ -71,7 +71,7 @@ public class HttpService implements IHttpService{ for (int i = 0; i < dataArray.size(); i++) { LogisticsEnvironmentRecord environmentRecord = new LogisticsEnvironmentRecord(); JSONObject oneObject = dataArray.getJSONObject(i); - environmentRecord.setEquipmentNum(oneObject.getString("deviceKey")); + environmentRecord.setEquipmentNum(oneObject.getString("deviceAddr")); environmentRecord.setRecordTime(System.currentTimeMillis()); JSONArray realTimeData = oneObject.getJSONArray("realTimeData"); diff --git a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java index 1cd4a728..53475b66 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -57,7 +58,7 @@ public class MbpsService implements IMbpsService { @Override public MbpsVo.SelMbpsByTime selMbpsByTime(MbpsDto.SelMbpsByTime param) { - String[] countArr = new String[10]; + String[] countArr = new String[param.getQueryOfDay()]; //查找当前时间 Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); @@ -92,12 +93,33 @@ public class MbpsService implements IMbpsService { @Override public MbpsVo.SelTempAndHumidity selTeamAndHumidity(MbpsDto.SelTeamAndHumidity param) { MbpsVo.SelTempAndHumidity tempAndHumidity = new MbpsVo.SelTempAndHumidity(); + + String[] countArr = new String[param.getQueryOfDay()]; + //查找当前时间 + Date date = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH"); + String nowDate = format.format(date); + //查询温度 - List tempsList = environmentRecordDao.selTempByTime(param.getWarehouseId(),param.getStartTime(),param.getEndTime()); + List tempsList = environmentRecordDao.selTempByTime(param.getWarehouseId(),countArr,nowDate); + if (CollectionUtil.isNotEmpty(tempsList)){ + for (MbpsVo.Temps temps : tempsList) { + if (ObjectUtil.isNull(temps.getTemp())){ + temps.setTemp(new BigDecimal(0)); + } + } + } tempAndHumidity.getTemps().addAll(tempsList); //查询湿度 - List humidityList = environmentRecordDao.selHumidityByTime(param.getWarehouseId(),param.getStartTime(),param.getEndTime()); + List humidityList = environmentRecordDao.selHumidityByTime(param.getWarehouseId(),countArr,nowDate); + if (CollectionUtil.isNotEmpty(humidityList)){ + for (MbpsVo.Humiditys humidity : humidityList) { + if (ObjectUtil.isNull(humidity.getHumidity())){ + humidity.setHumidity(new BigDecimal(0)); + } + } + } tempAndHumidity.getHumiditys().addAll(humidityList); return tempAndHumidity; diff --git a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml index a62c9e96..44f600b2 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml @@ -4,46 +4,56 @@ @@ -51,7 +51,7 @@ t_logistics_environment_record AS er LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id - WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 + WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 ) AS newEr ON newEr.recordTime = s.date group by s.date ORDER BY s.date From 505bbd46222de31eaa572361b56c24fb827f04fa Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 14 May 2021 10:48:24 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logistics/src/main/resources/application-prod.yml | 8 ++++---- logistics/src/main/resources/application.yml | 4 ++-- logistics/src/main/resources/druid-prod.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/logistics/src/main/resources/application-prod.yml b/logistics/src/main/resources/application-prod.yml index 6c9ab1b5..e3339878 100644 --- a/logistics/src/main/resources/application-prod.yml +++ b/logistics/src/main/resources/application-prod.yml @@ -8,7 +8,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 127.0.0.1 + host: 121.36.3.207 password: 111111 port: 5672 username: admin @@ -21,15 +21,15 @@ spring: max-idle: 10 max-wait: -1ms min-idle: 0 -# password: '' - password: 'areowqr!@43ef' + password: '' +# password: 'areowqr!@43ef' port: 6379 timeout: 1000ms swagger: enable: true eureka: instance: - ip-address: 121.36.3.207 + ip-address: 119.3.214.36 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ diff --git a/logistics/src/main/resources/application.yml b/logistics/src/main/resources/application.yml index 0e768cd1..ea3545e5 100644 --- a/logistics/src/main/resources/application.yml +++ b/logistics/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common,util-test + active: prod + include: common,util-prod diff --git a/logistics/src/main/resources/druid-prod.yml b/logistics/src/main/resources/druid-prod.yml index fe62722f..4972e9ae 100644 --- a/logistics/src/main/resources/druid-prod.yml +++ b/logistics/src/main/resources/druid-prod.yml @@ -15,7 +15,7 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: + password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://127.0.0.1/logisticspark?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://www.tall.wiki/logisticspark?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL - env: CCSENS_GAME \ No newline at end of file + env: CCSENS_TALL \ No newline at end of file From 650cf02b64799f33748bd477d93e501bd9aeb32b Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 14 May 2021 11:15:45 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logistics/src/main/resources/application.yml | 4 ++-- logistics/src/main/resources/druid-prod.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/logistics/src/main/resources/application.yml b/logistics/src/main/resources/application.yml index ea3545e5..0e768cd1 100644 --- a/logistics/src/main/resources/application.yml +++ b/logistics/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common,util-prod + active: test + include: common,util-test diff --git a/logistics/src/main/resources/druid-prod.yml b/logistics/src/main/resources/druid-prod.yml index 4972e9ae..1316ca0e 100644 --- a/logistics/src/main/resources/druid-prod.yml +++ b/logistics/src/main/resources/druid-prod.yml @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://www.tall.wiki/logisticspark?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://www.tall.wiki/logistics?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file From d4a40d0b3808cfb6e09a4ba753c2827a96ac7552 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 14 May 2021 15:25:33 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/logistics/Netty/NettyClient.java | 2 +- .../logistics/api/WarehouseController.java | 9 ++++--- .../ccsens/logistics/bean/dto/MbpsDto.java | 3 +++ .../ccsens/logistics/bean/vo/EquipmentVo.java | 17 ++++++++++++- .../com/ccsens/logistics/bean/vo/ParkVo.java | 25 +++++++++++++++++++ .../dao/LogisticsEnvironmentRecordDao.java | 4 +-- .../dao/LogisticsHeatImagingRecordDao.java | 3 ++- .../dao/LogisticsParkEquipmentDao.java | 10 ++++++++ .../logistics/service/IWarehouseService.java | 5 ++-- .../ccsens/logistics/service/MbpsService.java | 10 ++++---- .../logistics/service/WarehouseService.java | 16 ++++++++++-- .../LogisticsEnvironmentRecordDao.xml | 20 ++++++++------- .../LogisticsHeatImagingRecordDao.xml | 3 +++ .../mapper_dao/LogisticsParkEquipmentDao.xml | 13 ++++++++++ 14 files changed, 113 insertions(+), 27 deletions(-) create mode 100644 logistics/src/main/java/com/ccsens/logistics/bean/vo/ParkVo.java diff --git a/logistics/src/main/java/com/ccsens/logistics/Netty/NettyClient.java b/logistics/src/main/java/com/ccsens/logistics/Netty/NettyClient.java index a264c6e7..0d3db04f 100644 --- a/logistics/src/main/java/com/ccsens/logistics/Netty/NettyClient.java +++ b/logistics/src/main/java/com/ccsens/logistics/Netty/NettyClient.java @@ -70,7 +70,7 @@ public class NettyClient { ScheduledExecutorService service = Executors .newSingleThreadScheduledExecutor(); // 第二个参数为首次执行的延时时间，第三个参数为定时执行的间隔时间 - service.scheduleAtFixedRate(runnable, 2, 30, TimeUnit.SECONDS); + service.scheduleAtFixedRate(runnable, 2, 5, TimeUnit.SECONDS); // 创建并执行在给定延迟后启用的 ScheduledFuture。 // 参数： // callable - 要执行的功能 diff --git a/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java b/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java index e79b7712..48f51cc4 100644 --- a/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java +++ b/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java @@ -3,6 +3,7 @@ package com.ccsens.logistics.api; import com.ccsens.logistics.bean.dto.MbpsDto; import com.ccsens.logistics.bean.dto.WarehouseDto; import com.ccsens.logistics.bean.vo.MbpsVo; +import com.ccsens.logistics.bean.vo.ParkVo; import com.ccsens.logistics.bean.vo.WarehouseVo; import com.ccsens.logistics.service.IWarehouseService; import com.ccsens.util.JsonResponse; @@ -34,11 +35,11 @@ public class WarehouseController { @ApiOperation(value = "查询仓库列表及仓库下的摄像头", notes = "mz:查询仓库列表及仓库下的摄像头") @RequestMapping(value = "/selAllWarehouse", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selAllWarehouse(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse selAllWarehouse(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询仓库列表及仓库下的摄像头：{}",params); - List warehouse = iWarehouseService.selAllWarehouse(params.getParam()); - log.info("查询仓库列表及仓库下的摄像头:{}",warehouse); - return JsonResponse.newInstance().ok(warehouse); + ParkVo.ParkInfo parkInfo = iWarehouseService.selAllWarehouse(params.getParam()); + log.info("查询仓库列表及仓库下的摄像头:{}",parkInfo); + return JsonResponse.newInstance().ok(parkInfo); } } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java index 9f0e33ee..a57a25c0 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java @@ -50,6 +50,9 @@ public class MbpsDto { @Data @ApiModel(value = "查询热成像信息") public static class SelHeatImaging{ + @NotNull(message = "请选择要查看的仓库") + @ApiModelProperty("仓库id") + private Long warehouseId; @ApiModelProperty("热成像设备id") private Long id; } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java index 241b3a21..14fea90a 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java @@ -11,7 +11,7 @@ import lombok.Data; public class EquipmentVo { @Data - @ApiModel("摄像头列表") + @ApiModel("仓库摄像头列表") public static class AllCamera{ @ApiModelProperty("设备id") private Long equipmentId; @@ -24,4 +24,19 @@ public class EquipmentVo { @ApiModelProperty("设备地址") private String equipmentLocation; } + + @Data + @ApiModel("园区设备列表") + public static class ParkEquipment{ + @ApiModelProperty("设备id") + private Long equipmentId; + @ApiModelProperty("设备名称") + private String equipmentName; + @ApiModelProperty("设备编号") + private String equipmentNumber; + @ApiModelProperty("设备类型(0-车辆识别摄像头进,1-车辆识别摄像头出)") + private Byte equipmentType; + @ApiModelProperty("设备地址") + private String equipmentLocation; + } } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/ParkVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/ParkVo.java new file mode 100644 index 00000000..b37d31e6 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/ParkVo.java @@ -0,0 +1,25 @@ +package com.ccsens.logistics.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author 马 + */ +@Data +public class ParkVo { + + @Data + @ApiModel("仓库及摄像头") + public static class ParkInfo{ + @ApiModelProperty("园区设备") + private List parkEquipment = new ArrayList<>(); + @ApiModelProperty("仓库信息") + private List warehouseInfo = new ArrayList<>(); + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java index 7ade33c1..f2c1525c 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java @@ -36,12 +36,12 @@ public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecor * @param id 仓库id * @return (0-否,1-是) */ - Byte selFire(Long id); + Integer selFire(@Param("id") Long id); /** * 是否有水灾 * @param id 仓库id * @return (0-否,1-是) */ - Byte selFlood(Long id); + Integer selFlood(@Param("id") Long id); } diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java index 8a109bb5..7f774c79 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java @@ -13,7 +13,8 @@ public interface LogisticsHeatImagingRecordDao { /** * 查询热成像最新信息 * @param id 热成像设备id + * @param warehouseId 仓库id * @return 热成像信息 */ - MbpsVo.SelHeatImaging selHeatImaging(@Param("id") Long id); + MbpsVo.SelHeatImaging selHeatImaging(@Param("id") Long id,@Param("warehouseId") Long warehouseId); } diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsParkEquipmentDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsParkEquipmentDao.java index 07f4b8a8..12d6fce5 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsParkEquipmentDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsParkEquipmentDao.java @@ -1,11 +1,21 @@ package com.ccsens.logistics.persist.dao; +import com.ccsens.logistics.bean.vo.EquipmentVo; import com.ccsens.logistics.persist.mapper.LogisticsParkEquipmentMapper; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author 马 */ @Repository public interface LogisticsParkEquipmentDao extends LogisticsParkEquipmentMapper { + /** + * 查询园区下的设备 + * @param parkId 园区id + * @return 园区设备列表 + */ + List selParkEquipment(Long parkId); + } diff --git a/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java b/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java index 66fa5a1a..ccfaaab8 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java @@ -2,6 +2,7 @@ package com.ccsens.logistics.service; import com.ccsens.logistics.bean.dto.WarehouseDto; import com.ccsens.logistics.bean.vo.MbpsVo; +import com.ccsens.logistics.bean.vo.ParkVo; import com.ccsens.logistics.bean.vo.WarehouseVo; import java.util.List; @@ -14,7 +15,7 @@ public interface IWarehouseService { /** * 查询仓库及摄像头 * @param param 园区id 仓库id - * @return 仓库及摄像头 + * @return 园区设备、仓库及摄像头 */ - List selAllWarehouse(WarehouseDto.SelWarehouse param); + ParkVo.ParkInfo selAllWarehouse(WarehouseDto.SelWarehouse param); } diff --git a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java index 53475b66..0d139a67 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java @@ -127,7 +127,7 @@ public class MbpsService implements IMbpsService { @Override public MbpsVo.SelHeatImaging selHeatImaging(MbpsDto.SelHeatImaging param) { - return heatImagingRecordDao.selHeatImaging(param.getId()); + return heatImagingRecordDao.selHeatImaging(param.getId(),param.getWarehouseId()); } @Override @@ -141,10 +141,10 @@ public class MbpsService implements IMbpsService { if (CollectionUtil.isNotEmpty(warehouses)){ for (LogisticsWarehouse warehouse : warehouses) { //火灾 - Byte fireAlarm = environmentRecordDao.selFire(warehouse.getId()); + Integer fireAlarm = environmentRecordDao.selFire(warehouse.getId()); fireAlarm = fireAlarm == null ? 0 : fireAlarm; //水灾 - Byte floodAlarm = environmentRecordDao.selFlood(warehouse.getId()); + Integer floodAlarm = environmentRecordDao.selFlood(warehouse.getId()); floodAlarm = floodAlarm == null ? 0 : floodAlarm; if (ObjectUtil.isNotNull(fireAlarm)){ @@ -166,8 +166,8 @@ public class MbpsService implements IMbpsService { } } }else{ - Byte fireAlarm = environmentRecordDao.selFire(param.getWarehouseId()); - Byte floodAlarm = environmentRecordDao.selFlood(param.getWarehouseId()); + Integer fireAlarm = environmentRecordDao.selFire(param.getWarehouseId()); + Integer floodAlarm = environmentRecordDao.selFlood(param.getWarehouseId()); if (ObjectUtil.isNotNull(fireAlarm)){ fireOrFlood.setIsFire(fireAlarm == 1); } diff --git a/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java b/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java index f18cfdb1..98251b5a 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java @@ -1,7 +1,10 @@ package com.ccsens.logistics.service; import com.ccsens.logistics.bean.dto.WarehouseDto; +import com.ccsens.logistics.bean.vo.EquipmentVo; +import com.ccsens.logistics.bean.vo.ParkVo; import com.ccsens.logistics.bean.vo.WarehouseVo; +import com.ccsens.logistics.persist.dao.LogisticsParkEquipmentDao; import com.ccsens.logistics.persist.dao.LogisticsWarehouseDao; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,10 +24,19 @@ public class WarehouseService implements IWarehouseService { @Resource private LogisticsWarehouseDao warehouseDao; + @Resource + private LogisticsParkEquipmentDao parkEquipmentDao; @Override - public List selAllWarehouse(WarehouseDto.SelWarehouse param) { - return warehouseDao.selWarehouseAndCamera(param.getParkId(),param.getWarehouseId()); + public ParkVo.ParkInfo selAllWarehouse(WarehouseDto.SelWarehouse param) { + ParkVo.ParkInfo parkInfo = new ParkVo.ParkInfo(); + //查询仓库及仓库下的设备 + List warehouses = warehouseDao.selWarehouseAndCamera(param.getParkId(), param.getWarehouseId()); + parkInfo.getWarehouseInfo().addAll(warehouses); + //查询园区下的摄像头设备 + List parkEquipments = parkEquipmentDao.selParkEquipment(param.getParkId()); + parkInfo.getParkEquipment().addAll(parkEquipments); + return parkInfo; } } diff --git a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml index 71b76897..188a9181 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml @@ -56,34 +56,36 @@ group by s.date ORDER BY s.date - + SELECT er.is_alarm AS isFire FROM t_logistics_environment_record AS er - LEFT JOIN t_logistics_warehouse AS w ON er.warehouse_id = w.id - AND w.rec_status = 0 + LEFT JOIN t_logistics_equipment AS e ON e.id = er.equipment_id + LEFT JOIN t_logistics_warehouse AS w ON e.warehouse_id = w.id + AND w.rec_status = 0 WHERE er.num_type = 3 AND w.id = #{id} ORDER BY er.record_time DESC - LIMIT 1 + LIMIT 1 - SELECT er.is_alarm AS isFlood FROM t_logistics_environment_record AS er - LEFT JOIN t_logistics_warehouse AS w ON er.warehouse_id = w.id - AND w.rec_status = 0 + LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number + LEFT JOIN t_logistics_warehouse AS w ON e.warehouse_id = w.id + AND w.rec_status = 0 WHERE er.num_type = 2 AND w.id = #{id} ORDER BY er.record_time DESC - LIMIT 1 + LIMIT 1 \ No newline at end of file diff --git a/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml index 8d08e7a6..558569d0 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml @@ -18,6 +18,9 @@ AND le.id = #{id} + + AND le.warehouse_id = #{warehouseId} + ORDER BY ir.record_time DESC LIMIT 1 diff --git a/logistics/src/main/resources/mapper_dao/LogisticsParkEquipmentDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsParkEquipmentDao.xml index e095ce20..1d512e55 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsParkEquipmentDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsParkEquipmentDao.xml @@ -2,4 +2,17 @@ + + \ No newline at end of file From 8af42a0726b8145077a880b17a61d320d851e5c7 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 14 May 2021 15:46:28 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=A9=E6=B9=BF?= =?UTF-8?q?=E5=BA=A6=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java | 2 ++ .../logistics/persist/dao/LogisticsEnvironmentRecordDao.java | 4 ++-- .../main/java/com/ccsens/logistics/service/MbpsService.java | 4 ++-- .../resources/mapper_dao/LogisticsEnvironmentRecordDao.xml | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java index a57a25c0..38de4c70 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java @@ -36,6 +36,8 @@ public class MbpsDto { @Data @ApiModel(value = "查看温度和湿度") public static class SelTeamAndHumidity{ + @ApiModelProperty("园区id") + private Long parkId; @NotNull(message = "请选择要查询的仓库") @ApiModelProperty("仓库id") private Long warehouseId; diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java index f2c1525c..e1389762 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsEnvironmentRecordDao.java @@ -20,7 +20,7 @@ public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecor * @param nowDate 现在的时间 * @return 温度列表 */ - List selTempByTime(@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); + List selTempByTime(@Param("parkId") Long parkId,@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); /** * 查询湿度变化 @@ -29,7 +29,7 @@ public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecor * @param nowDate 现在的时间 * @return 湿度列表 */ - List selHumidityByTime(@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); + List selHumidityByTime(@Param("parkId") Long parkId,@Param("warehouseId") Long warehouseId,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); /** * 是否有火灾 diff --git a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java index 0d139a67..6de679b8 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java @@ -101,7 +101,7 @@ public class MbpsService implements IMbpsService { String nowDate = format.format(date); //查询温度 - List tempsList = environmentRecordDao.selTempByTime(param.getWarehouseId(),countArr,nowDate); + List tempsList = environmentRecordDao.selTempByTime(param.getParkId(),param.getWarehouseId(),countArr,nowDate); if (CollectionUtil.isNotEmpty(tempsList)){ for (MbpsVo.Temps temps : tempsList) { if (ObjectUtil.isNull(temps.getTemp())){ @@ -112,7 +112,7 @@ public class MbpsService implements IMbpsService { tempAndHumidity.getTemps().addAll(tempsList); //查询湿度 - List humidityList = environmentRecordDao.selHumidityByTime(param.getWarehouseId(),countArr,nowDate); + List humidityList = environmentRecordDao.selHumidityByTime(param.getParkId(),param.getWarehouseId(),countArr,nowDate); if (CollectionUtil.isNotEmpty(humidityList)){ for (MbpsVo.Humiditys humidity : humidityList) { if (ObjectUtil.isNull(humidity.getHumidity())){ diff --git a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml index 188a9181..9987e4d3 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml @@ -24,7 +24,7 @@ t_logistics_environment_record AS er LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id - WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 + WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 1 AND e.warehouse_id = #{warehouseId} AND w.park_id = #{parkId} ) AS newEr ON newEr.recordTime = s.date group by s.date ORDER BY s.date @@ -51,7 +51,7 @@ t_logistics_environment_record AS er LEFT JOIN t_logistics_equipment AS e ON er.equipment_num = e.equipment_number LEFT JOIN t_logistics_warehouse AS w ON w.id = e.warehouse_id - WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = 1 + WHERE er.rec_status = 0 AND e.rec_status = 0 AND w.rec_status = 0 AND er.num_type = 0 AND e.warehouse_id = #{warehouseId} AND w.park_id = #{parkId} ) AS newEr ON newEr.recordTime = s.date group by s.date ORDER BY s.date From 6a0ee5084f8f98fc32f6b60e4d202d4b2e48c5a3 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 14 May 2021 18:24:18 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=80=BB=E5=90=9E=E5=90=90=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/logistics/bean/dto/MbpsDto.java | 1 + .../logistics/bean/dto/WarehouseDto.java | 3 +++ .../persist/dao/LogisticsCarRecordDao.java | 16 +++++++++---- .../ccsens/logistics/service/MbpsService.java | 24 +++++++++++++++---- .../mapper_dao/LogisticsCarRecordDao.xml | 8 +++---- 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java index 38de4c70..23fecb5f 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java @@ -36,6 +36,7 @@ public class MbpsDto { @Data @ApiModel(value = "查看温度和湿度") public static class SelTeamAndHumidity{ + @NotNull(message = "请选择要查询的园区") @ApiModelProperty("园区id") private Long parkId; @NotNull(message = "请选择要查询的仓库") diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/WarehouseDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/WarehouseDto.java index 9249e96c..64f8e8bd 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/WarehouseDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/WarehouseDto.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * @author 马 */ @@ -13,6 +15,7 @@ public class WarehouseDto { @Data @ApiModel("查询仓库") public static class SelWarehouse{ + @NotNull(message = "请选择要查询的园区") @ApiModelProperty("园区id") private Long parkId; @ApiModelProperty("仓库id") diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java index 8c4af509..405f86c7 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java @@ -20,34 +20,36 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper { * @param warehouseId 仓库id * @return 车辆吞进量 */ - Long selCarOfIn(Long warehouseId); + Long selCarOfIn(@Param("warehouseId") Long warehouseId); /** * 查询车辆吐出量 * @param warehouseId 仓库id * @return 车辆吐出量 */ - Long selCarOfOut(Long warehouseId); + Long selCarOfOut(@Param("warehouseId") Long warehouseId); /** * 查询入库吨数 * @param warehouseId 仓库id * @return 入库吨数 */ - Long selWeightOfIn(Long warehouseId); + Long selWeightOfIn(@Param("warehouseId") Long warehouseId); /** * 查询出货吨数 * @param warehouseId 仓库id * @return 出货吨数 */ - Long selWeightOfOut(Long warehouseId); + Long selWeightOfOut(@Param("warehouseId") Long warehouseId); /** * 根据时间查询车辆吞进量 * @param queryType 查询类型 * @param startTime 开始时间 * @param endTime 结束时间 + * @param nowDate 现在的时间 + * @param countArr 查询的天数 * @return 该时间车辆吞进量 */ List selCarOfInByTime(@Param("queryType") Byte queryType, @Param("startTime") Long startTime, @Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); @@ -57,6 +59,8 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper { *@param queryType 查询类型 * @param startTime 开始时间 * @param endTime 结束时间 + * @param nowDate 现在的时间 + * @param countArr 查询的天数 * @return 该时间车辆吐出量 */ List selCarOfOutByTime(@Param("queryType") Byte queryType,@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); @@ -66,6 +70,8 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper { * @param queryType 查询类型 * @param startTime 开始时间 * @param endTime 结束时间 + * @param nowDate 现在的时间 + * @param countArr 查询的天数 * @return 该时间入货量 */ List selWeightOfInByTime(@Param("queryType") Byte queryType,@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); @@ -75,6 +81,8 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper { * @param queryType 查询类型 * @param startTime 开始时间 * @param endTime 结束时间 + * @param nowDate 现在的时间 + * @param countArr 查询的天数 * @return 该时间车辆出货量 */ List selWeightOfOutByTime(@Param("queryType") Byte queryType,@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate); diff --git a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java index 6de679b8..2012538d 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java @@ -43,16 +43,32 @@ public class MbpsService implements IMbpsService { MbpsVo.AllMbps allMbps = new MbpsVo.AllMbps(); //查询吞进量 Long carOfIn = carRecordDao.selCarOfIn(param.getWarehouseId()); - allMbps.setCarOfIn(carOfIn); + if (null == carOfIn){ + allMbps.setCarOfIn(0L); + }else{ + allMbps.setCarOfIn(carOfIn); + } //查询吐出量 Long carOfOut = carRecordDao.selCarOfOut(param.getWarehouseId()); - allMbps.setCarOfOut(carOfOut); + if (null == carOfOut){ + allMbps.setCarOfOut(0L); + }else { + allMbps.setCarOfOut(carOfOut); + } //查询入库吨数 Long weightOfIn = carRecordDao.selWeightOfIn(param.getWarehouseId()); - allMbps.setWeightOfIn(weightOfIn); + if (null == weightOfIn){ + allMbps.setWeightOfIn(0L); + }else { + allMbps.setWeightOfIn(weightOfIn); + } //查询出货吨数 Long weightOfOut = carRecordDao.selWeightOfOut(param.getWarehouseId()); - allMbps.setWeightOfOut(weightOfOut); + if (null == weightOfOut){ + allMbps.setWeightOfOut(0L); + }else { + allMbps.setWeightOfOut(weightOfOut); + } return allMbps; } diff --git a/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml index 0ea8c920..c0daee4e 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml @@ -4,28 +4,28 @@