diff --git a/logistics/src/main/java/com/ccsens/logistics/api/EquipmentController.java b/logistics/src/main/java/com/ccsens/logistics/api/EquipmentController.java new file mode 100644 index 00000000..19274ac9 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/api/EquipmentController.java @@ -0,0 +1,42 @@ +package com.ccsens.logistics.api; + +import com.ccsens.logistics.bean.dto.EquipmentDto; +import com.ccsens.logistics.bean.vo.EquipmentVo; +import com.ccsens.logistics.service.IEquipmentService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马 + */ +@Slf4j +@Api(tags = "设备相关接口") +@RestController +@RequestMapping("/equipment") +public class EquipmentController { + + @Resource + private IEquipmentService iEquipmentService; + + @ApiOperation(value = "查询摄像头列表（暂不使用）", notes = "mz:查询摄像头列表") + @RequestMapping(value = "/selCamera", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selCamera(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看交付物的历史记录：{}",params); +// List allCamera = iEquipmentService.selCamera(params.getParam()); +// log.info("查看交付物的历史记录:{}",allCamera); + return JsonResponse.newInstance().ok(); + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java b/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java index 133e5ef6..0441cd6c 100644 --- a/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java +++ b/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java @@ -25,7 +25,7 @@ import java.util.List; @Slf4j @Api(tags = "吞吐量相关接口" , description = "") @RestController -@RequestMapping("/Mbps") +@RequestMapping("/mbps") public class MbpsController { @Resource @@ -49,4 +49,13 @@ public class MbpsController { return JsonResponse.newInstance().ok(allMbps); } + @ApiOperation(value = "查询温度与湿度", notes = "mz:查询温度与湿度") + @RequestMapping(value = "/selTeamAndHumidity", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selTeamAndHumidity(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看交付物的历史记录：{}",params); + MbpsVo.SelTempAndHumidity teamAndHumidity = iMbpsService.selTeamAndHumidity(params.getParam()); + log.info("查看交付物的历史记录:{}",teamAndHumidity); + return JsonResponse.newInstance().ok(teamAndHumidity); + } + } diff --git a/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java b/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java new file mode 100644 index 00000000..a7255fc6 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java @@ -0,0 +1,44 @@ +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.WarehouseVo; +import com.ccsens.logistics.service.IWarehouseService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马 + */ +@Slf4j +@Api(tags = "仓库相关接口" , description = "") +@RestController +@RequestMapping("/warehouse") +public class WarehouseController { + + @Resource + private IWarehouseService iWarehouseService; + + @ApiOperation(value = "查询仓库列表及仓库下的摄像头", notes = "mz:查询仓库列表及仓库下的摄像头") + @RequestMapping(value = "/selAllWarehouse", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + 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); + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/EquipmentDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/EquipmentDto.java new file mode 100644 index 00000000..5608416a --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/EquipmentDto.java @@ -0,0 +1,20 @@ +package com.ccsens.logistics.bean.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class EquipmentDto { + + @Data + @ApiModel("查询摄像头") + public static class SelCamera{ + @ApiModelProperty("仓库id") + private Long warehouseId; + } +} 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 1e2c4706..b9caca4c 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 @@ -11,14 +11,14 @@ import lombok.Data; public class MbpsDto { @Data - @ApiModel + @ApiModel(value = "查询总吞吐量") public static class SelAllMbpsSerch{ @ApiModelProperty("仓库id") private Long warehouseId; } @Data - @ApiModel + @ApiModel(value = "查询吞吐量折线图") public static class SelMbpsByTime{ @ApiModelProperty("查询类型(0-按天,1-按周,2-按月,3-按年)") private Byte queryType; @@ -28,4 +28,15 @@ public class MbpsDto { private Long endTime; } + @Data + @ApiModel(value = "查看温度和湿度") + public static class SelTeamAndHumidity{ + @ApiModelProperty("仓库id") + private Long warehouseId; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + } + } 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 new file mode 100644 index 00000000..9249e96c --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/WarehouseDto.java @@ -0,0 +1,21 @@ +package com.ccsens.logistics.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class WarehouseDto { + + @Data + @ApiModel("查询仓库") + public static class SelWarehouse{ + @ApiModelProperty("园区id") + private Long parkId; + @ApiModelProperty("仓库id") + private Long warehouseId; + } +} diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java index 365ba78b..d42c8863 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipment.java @@ -20,6 +20,10 @@ public class LogisticsEquipment implements Serializable { private Byte recStatus; + private String equipmentLocation; + + private String remark; + private static final long serialVersionUID = 1L; public Long getId() { @@ -86,6 +90,22 @@ public class LogisticsEquipment implements Serializable { this.recStatus = recStatus; } + public String getEquipmentLocation() { + return equipmentLocation; + } + + public void setEquipmentLocation(String equipmentLocation) { + this.equipmentLocation = equipmentLocation == null ? null : equipmentLocation.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -100,6 +120,8 @@ public class LogisticsEquipment implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", equipmentLocation=").append(equipmentLocation); + sb.append(", remark=").append(remark); sb.append("]"); return sb.toString(); } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java index 7ee62998..f3d92873 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsEquipmentExample.java @@ -594,6 +594,146 @@ public class LogisticsEquipmentExample { addCriterion("rec_status not between", value1, value2, "recStatus"); 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 andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { 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 new file mode 100644 index 00000000..1824a15e --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/EquipmentVo.java @@ -0,0 +1,27 @@ +package com.ccsens.logistics.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class EquipmentVo { + + @Data + @ApiModel("摄像头列表") + public static class AllCamera{ + @ApiModelProperty("设备id") + private Long equipmentId; + @ApiModelProperty("设备名称") + private String equipmentName; + @ApiModelProperty("设备编号") + private Integer equipmentNumber; + @ApiModelProperty("设备类型(0-摄像头,1-温度测试,2-湿度测试,3-漏水检测)") + private Byte equipmentType; + @ApiModelProperty("设备地址") + private String equipmentLocation; + } +} 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 e325aca7..e58da902 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 @@ -1,9 +1,11 @@ package com.ccsens.logistics.bean.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.sql.Date; import java.util.ArrayList; import java.util.List; @@ -71,4 +73,32 @@ public class MbpsVo { private Long weightOfOut; } + + @Data + @ApiModel("查询温度和湿度") + public static class SelTempAndHumidity{ + @ApiModelProperty("温度变化") + private List temps = new ArrayList<>(); + @ApiModelProperty("湿度变化") + private List humiditys = new ArrayList<>(); + } + @Data + @ApiModel("温度变化") + public static class Temps{ + @JsonFormat(pattern = "HH:mm:ss") + @ApiModelProperty("时间") + private Date time; + @ApiModelProperty("温度") + private Long temp; + } + @Data + @ApiModel("湿度变化") + public static class Humiditys{ + @JsonFormat(pattern = "HH:mm:ss") + @ApiModelProperty("时间") + private Date time; + @ApiModelProperty("湿度") + private Long humidity; + } + } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/WarehouseVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/WarehouseVo.java new file mode 100644 index 00000000..354b1598 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/WarehouseVo.java @@ -0,0 +1,26 @@ +package com.ccsens.logistics.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author 马 + */ +@Data +public class WarehouseVo { + + @Data + @ApiModel("仓库及摄像头") + public static class AllWarehouse{ + @ApiModelProperty("仓库id") + private Long warehouseId; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("摄像头列表") + private List cameras; + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/config/SwaggerConfigure.java b/logistics/src/main/java/com/ccsens/logistics/config/SwaggerConfigure.java index 0773e841..692d3dcd 100644 --- a/logistics/src/main/java/com/ccsens/logistics/config/SwaggerConfigure.java +++ b/logistics/src/main/java/com/ccsens/logistics/config/SwaggerConfigure.java @@ -28,7 +28,7 @@ public class SwaggerConfigure /*implements WebMvcConfigurer*/ { .apiInfo(apiInfo()) .select() .apis(RequestHandlerSelectors - .basePackage("com.ccsens.logistics.web")) + .basePackage("com.ccsens.logistics.api")) .build() .globalOperationParameters(setHeaderToken()); } 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 abc368a3..e14b8ee1 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 @@ -5,6 +5,7 @@ import com.ccsens.logistics.persist.mapper.LogisticsCarRecordMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; + import java.util.List; /** 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 7f0abd6a..70e55a82 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 @@ -1,11 +1,33 @@ package com.ccsens.logistics.persist.dao; +import com.ccsens.logistics.bean.vo.MbpsVo; import com.ccsens.logistics.persist.mapper.LogisticsEnvironmentRecordMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author 马 */ @Repository public interface LogisticsEnvironmentRecordDao extends LogisticsEnvironmentRecordMapper { + + /** + * 查询温度变化 + * @param warehouseId 仓库id + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 温度列表 + */ + List selTempByTime(@Param("warehouseId") Long warehouseId,@Param("startTime") Long startTime,@Param("endTime") Long endTime); + + /** + * 查询湿度变化 + * @param warehouseId 仓库id + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return 湿度列表 + */ + List selHumidityByTime(@Param("warehouseId") Long warehouseId,@Param("startTime") Long startTime,@Param("endTime") Long endTime); } diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsWarehouseDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsWarehouseDao.java index c496d718..cd77d2b5 100644 --- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsWarehouseDao.java +++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsWarehouseDao.java @@ -1,11 +1,24 @@ package com.ccsens.logistics.persist.dao; +import com.ccsens.logistics.bean.vo.WarehouseVo; import com.ccsens.logistics.persist.mapper.LogisticsWarehouseMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author 马 */ @Repository public interface LogisticsWarehouseDao extends LogisticsWarehouseMapper { + + /** + * 查询仓库及下面的摄像头 + * @param parkId 园区id + * @param warehouseId 仓库id + * @return 仓库及摄像头 + */ + List selWarehouseAndCamera(@Param("parkId") Long parkId,@Param("warehouseId") Long warehouseId); + } diff --git a/logistics/src/main/java/com/ccsens/logistics/service/EquipmentService.java b/logistics/src/main/java/com/ccsens/logistics/service/EquipmentService.java new file mode 100644 index 00000000..a1b6acd1 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/EquipmentService.java @@ -0,0 +1,19 @@ +package com.ccsens.logistics.service; + + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + + +/** + * 设备相关 + * @author 马 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class EquipmentService implements IEquipmentService { + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/IEquipmentService.java b/logistics/src/main/java/com/ccsens/logistics/service/IEquipmentService.java new file mode 100644 index 00000000..28d8325c --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/IEquipmentService.java @@ -0,0 +1,14 @@ +package com.ccsens.logistics.service; + +import com.ccsens.logistics.bean.dto.EquipmentDto; +import com.ccsens.logistics.bean.vo.EquipmentVo; + +import java.util.List; + +/** + * 设备相关 + * @author 马 + */ +public interface IEquipmentService { + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/IMbpsService.java b/logistics/src/main/java/com/ccsens/logistics/service/IMbpsService.java index cc5880ad..a11c5479 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/IMbpsService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/IMbpsService.java @@ -3,7 +3,6 @@ package com.ccsens.logistics.service; import com.ccsens.logistics.bean.dto.MbpsDto; import com.ccsens.logistics.bean.vo.MbpsVo; -import java.util.List; /** * @author 马 @@ -23,4 +22,11 @@ public interface IMbpsService { * @return 当前时间段的数据 */ MbpsVo.SelMbpsByTime selMbpsByTime(MbpsDto.SelMbpsByTime param); + + /** + * 查询温度和湿度 + * @param param 开始与结束时间 + * @return 温度与湿度 + */ + MbpsVo.SelTempAndHumidity selTeamAndHumidity(MbpsDto.SelTeamAndHumidity param); } diff --git a/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java b/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java new file mode 100644 index 00000000..66fa5a1a --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/IWarehouseService.java @@ -0,0 +1,20 @@ +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.WarehouseVo; + +import java.util.List; + +/** + * @author 马 + */ +public interface IWarehouseService { + + /** + * 查询仓库及摄像头 + * @param param 园区id 仓库id + * @return 仓库及摄像头 + */ + List 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 4bbeab85..2be14c93 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java @@ -3,6 +3,7 @@ package com.ccsens.logistics.service; import com.ccsens.logistics.bean.dto.MbpsDto; import com.ccsens.logistics.bean.vo.MbpsVo; import com.ccsens.logistics.persist.dao.LogisticsCarRecordDao; +import com.ccsens.logistics.persist.dao.LogisticsEnvironmentRecordDao; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -21,6 +22,8 @@ public class MbpsService implements IMbpsService { @Resource private LogisticsCarRecordDao carRecordDao; + @Resource + private LogisticsEnvironmentRecordDao environmentRecordDao; @Override public MbpsVo.AllMbps selAllMbps(MbpsDto.SelAllMbpsSerch param) { @@ -58,4 +61,18 @@ public class MbpsService implements IMbpsService { return selMbpsByTime; } + @Override + public MbpsVo.SelTempAndHumidity selTeamAndHumidity(MbpsDto.SelTeamAndHumidity param) { + MbpsVo.SelTempAndHumidity tempAndHumidity = new MbpsVo.SelTempAndHumidity(); + //查询温度 + List tempsList = environmentRecordDao.selTempByTime(param.getWarehouseId(),param.getStartTime(),param.getEndTime()); + tempAndHumidity.getTemps().addAll(tempsList); + + //查询湿度 + List humidityList = environmentRecordDao.selHumidityByTime(param.getWarehouseId(),param.getStartTime(),param.getEndTime()); + tempAndHumidity.getHumiditys().addAll(humidityList); + + return tempAndHumidity; + } + } diff --git a/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java b/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java new file mode 100644 index 00000000..90bb0ae5 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java @@ -0,0 +1,33 @@ +package com.ccsens.logistics.service; + +import com.ccsens.logistics.bean.dto.WarehouseDto; +import com.ccsens.logistics.bean.vo.WarehouseVo; +import com.ccsens.logistics.persist.dao.LogisticsWarehouseDao; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class WarehouseService implements IWarehouseService { + + @Resource + private LogisticsWarehouseDao warehouseDao; + + @Override + public List selAllWarehouse(WarehouseDto.SelWarehouse param) { + //查询仓库及摄像头 + List warehouses = warehouseDao.selWarehouseAndCamera(param.getParkId(),param.getWarehouseId()); + + return warehouses; + } + +} diff --git a/logistics/src/main/resources/application.yml b/logistics/src/main/resources/application.yml index a47f2a7b..0e768cd1 100644 --- a/logistics/src/main/resources/application.yml +++ b/logistics/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common,util-test diff --git a/logistics/src/main/resources/logback-spring.xml b/logistics/src/main/resources/logback-spring.xml index da37f156..6a6ee61e 100644 --- a/logistics/src/main/resources/logback-spring.xml +++ b/logistics/src/main/resources/logback-spring.xml @@ -9,7 +9,7 @@ logback - + diff --git a/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml index 1d735bca..d44b8d62 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml @@ -32,7 +32,7 @@ diff --git a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml index 1facdf7c..ebfcb8f1 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsEnvironmentRecordDao.xml @@ -2,4 +2,48 @@ + + + + \ No newline at end of file diff --git a/logistics/src/main/resources/mapper_dao/LogisticsWarehouseDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsWarehouseDao.xml index 4387bc1e..6c1d51cf 100644 --- a/logistics/src/main/resources/mapper_dao/LogisticsWarehouseDao.xml +++ b/logistics/src/main/resources/mapper_dao/LogisticsWarehouseDao.xml @@ -2,4 +2,39 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/logistics/src/main/resources/mapper_raw/LogisticsEquipmentMapper.xml b/logistics/src/main/resources/mapper_raw/LogisticsEquipmentMapper.xml index 36e4b848..eac5cd7a 100644 --- a/logistics/src/main/resources/mapper_raw/LogisticsEquipmentMapper.xml +++ b/logistics/src/main/resources/mapper_raw/LogisticsEquipmentMapper.xml @@ -10,6 +10,8 @@ + + @@ -71,7 +73,7 @@ id, name, equipment_number, equipment_type, warehouse_id, created_at, updated_at, - rec_status + rec_status, equipment_location, remark @@ -199,6 +215,12 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + equipment_location = #{record.equipmentLocation,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + @@ -213,7 +235,9 @@ warehouse_id = #{record.warehouseId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + equipment_location = #{record.equipmentLocation,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR} @@ -242,6 +266,12 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + equipment_location = #{equipmentLocation,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -253,7 +283,9 @@ warehouse_id = #{warehouseId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + equipment_location = #{equipmentLocation,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file