diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java index 4cf1985c4..5ab95fdcd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/DictionaryItemController.java @@ -11,6 +11,7 @@ import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.RefUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; @@ -59,6 +60,9 @@ public class DictionaryItemController { } @ApiOperation(value = "列表查询基础字典信息（查启用的）", notes = "列表查询基础字典信息（查启用的）", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), + }) @GetMapping(value = "/list") public Result> queryList(DictionaryItem dictionaryItem, HttpServletRequest req) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java index c775b0ed3..e54bc1db0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java @@ -74,4 +74,6 @@ public class DictionaryItem implements Serializable { @ApiModelProperty(value = "字典编码") private java.lang.String dictionaryEncoding; + @TableField(exist = false) + private java.lang.String projectSn; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java index a5ce22e38..a3fda7521 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java @@ -14,7 +14,7 @@ public interface IDictionaryItemService extends IService { * @param dictionaryEncoding * @return */ - List getDictList(String dictionaryEncoding); + List getDictList(String dictionaryEncoding, String projectSn); /** * 查询基础字典信息，根据数值 diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java index 80444417a..605b18ca5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.basicdata.mapper.DictionaryItemMapper; import com.zhgd.xmgl.modules.basicdata.mapper.DictionaryMapper; import com.zhgd.xmgl.modules.basicdata.service.IDictionaryItemService; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; @@ -35,7 +36,15 @@ public class DictionaryItemServiceImpl extends ServiceImpl getDictList(String dictionaryEncoding) { + public List getDictList(String dictionaryEncoding, String projectSn) { + if (StringUtils.isNotBlank(projectSn)) { + String newEncoding = dictionaryEncoding + "_" + projectSn; + Integer count = dictionaryMapper.selectCount(new LambdaQueryWrapper() + .eq(Dictionary::getDictionaryEncoding, newEncoding)); + if (count > 0) { + dictionaryEncoding = newEncoding; + } + } DictionaryItem di = new DictionaryItem(); di.setDictionaryEncoding(dictionaryEncoding); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -73,6 +82,14 @@ public class DictionaryItemServiceImpl extends ServiceImpl queryList(DictionaryItem dictionaryItem, HttpServletRequest req) { + if (StringUtils.isNotBlank(dictionaryItem.getProjectSn())) { + String newEncoding = dictionaryItem.getDictionaryEncoding() + "_" + dictionaryItem.getProjectSn(); + Integer count = dictionaryMapper.selectCount(new LambdaQueryWrapper() + .eq(Dictionary::getDictionaryEncoding, newEncoding)); + if (count > 0) { + dictionaryItem.setDictionaryEncoding(newEncoding); + } + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dictionaryItem, req.getParameterMap(), null, RefUtil.fieldNames(DictionaryItem::getName)) .orderByAsc(RefUtil.fieldNameUlc(DictionaryItem::getOrderNum)); @@ -80,4 +97,5 @@ public class DictionaryItemServiceImpl extends ServiceImpl pageList = list(queryWrapper); return pageList; } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java index 469a82b40..b7567f1b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -113,14 +114,21 @@ public class FrontierProtectionNoNetData implements Serializable { * 操作人id */ @Excel(name = "操作人id", width = 15) - @ApiModelProperty(value = "操作人id") - private java.lang.Integer operateId; - /** - * 操作时间 - */ - @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "操作时间") - private java.util.Date operateTime; + @ApiModelProperty(value = "操作人id") + private java.lang.Integer operateId; + /** + * 操作时间 + */ + @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "操作时间") + private java.util.Date operateTime; + + @TableField(exist = false) + @ApiModelProperty(value = "设备名称") + private java.lang.String devName; + @TableField(exist = false) + @ApiModelProperty(value = "设备位置") + private java.lang.String location; } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java index d99a32ab8..6f9239627 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDev.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -50,23 +51,23 @@ public class FrontierProtectionNoNetDev implements Serializable { @ApiModelProperty(value = "设备位置") private java.lang.String location; /** - * 项目sn - */ - @Excel(name = "项目sn", width = 15) - @ApiModelProperty(value = "项目sn") - private java.lang.String projectSn; - /** - * 责任班组id - */ - @Excel(name = "责任班组id", width = 15) - @ApiModelProperty(value = "责任班组id") - private java.lang.Integer dutyTeamInfoId; - /** - * 图片 - */ - @Excel(name = "图片", width = 15) - @ApiModelProperty(value = "图片") - private java.lang.Object image; + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + /** + * 责任班组id + */ + @Excel(name = "责任班组id", width = 15) + @ApiModelProperty(value = "责任班组id") + private java.lang.Long dutyTeamInfoId; + /** + * 图片 + */ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private java.lang.Object image; /** * 创建时间 yyyy-MM-dd HH:mm:ss */ @@ -87,14 +88,18 @@ public class FrontierProtectionNoNetDev implements Serializable { * 备注 */ @Excel(name = "备注", width = 15) - @ApiModelProperty(value = "备注") - private java.lang.String remark; - /** - * 上传时间 - */ - @Excel(name = "上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "上传时间") - private java.util.Date uploadDate; + @ApiModelProperty(value = "备注") + private java.lang.String remark; + /** + * 上传时间 + */ + @Excel(name = "上传时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "上传时间") + private java.util.Date uploadDate; + + @TableField(exist = false) + @ApiModelProperty(value = "责任班组名称") + private java.lang.String dutyTeamInfoName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java index d44a38aec..355cba7d1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java @@ -1,8 +1,15 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 临边防护(无网)-数据 @@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface FrontierProtectionNoNetDataMapper extends BaseMapper { + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java index c82d27ec6..ebec40814 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java @@ -1,8 +1,15 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 临边防护(无网)-设备 @@ -13,4 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface FrontierProtectionNoNetDevMapper extends BaseMapper { + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml index 985e3c6aa..550facff4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml @@ -1,4 +1,10 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml index 482490057..822133a7e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml @@ -1,4 +1,9 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java index 4da5bac7e..ae3f87bb2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java @@ -43,7 +43,7 @@ public class FrontierProtectionNoNetDataServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -51,11 +51,11 @@ public class FrontierProtectionNoNetDataServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { - String alias = ""; + String alias = "fpnnd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(FrontierProtectionNoNetData.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(FrontierProtectionNoNetData::getId)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java index 32bcde0a7..d0c97e0e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java @@ -34,7 +34,7 @@ public class FrontierProtectionNoNetDevServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -42,11 +42,11 @@ public class FrontierProtectionNoNetDevServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { - String alias = ""; + String alias = "fpnnd."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(FrontierProtectionNoNetDev.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(FrontierProtectionNoNetDev::getId)); return queryWrapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 4fed301e9..fb94ca1e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -187,9 +187,10 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl selectAiAnalyseHardWareAlarmList(Map map) { Integer sizeNum = MapUtils.getInteger(map, "sizeNum", 10); + String projectSn = MapUtils.getString(map, "projectSn"); map.put("sizeNum", sizeNum); List aiAnalyseHardWareAlarmRecords = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmList(map); - List dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE); + List dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, projectSn); try { Map typeMap = dictList.stream().collect(Collectors.toMap(DictionaryItem::getData, Function.identity(), (dictionaryItem, dictionaryItem2) -> dictionaryItem)); for (AiAnalyseHardWareAlarmRecord record : aiAnalyseHardWareAlarmRecords) { @@ -206,8 +207,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl map) { + String projectSn = MapUtils.getString(map, "projectSn"); List list = aiAnalyseHardWareAlarmRecordMapper.getAiAnalyseHardWareAlarmTotal(map); - return SectorVo.getSectorVoByDict(list, dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE), true); + return SectorVo.getSectorVoByDict(list, dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, projectSn), true); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java index 33fc23b4d..215907016 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighBookVehicleInfoController.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; -import com.zhgd.xmgl.modules.weight.entity.bo.WeighingTypeStatisticBo; import com.zhgd.xmgl.modules.weight.entity.vo.PullListVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighingTypeStatisticVo; import com.zhgd.xmgl.modules.weight.enums.WeighingTypeEnum; @@ -194,4 +194,14 @@ public class WeighBookVehicleInfoController { public Result pullList(@ApiIgnore @RequestParam HashMap paramMap) { return Result.success(weighBookVehicleInfoService.pullList(paramMap)); } + + @ApiOperation(value = "预约趋势", notes = "预约趋势", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countWeighBookVehicleInfoTrend") + public Result> countWeighBookVehicleInfoTrend(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(weighBookVehicleInfoService.countWeighBookVehicleInfoTrend(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java index 214eb60bf..39993f30c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/controller/WeighInfoController.java @@ -4,7 +4,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.weight.entity.WeighInfo; +import com.zhgd.xmgl.modules.weight.entity.vo.CountWeighInfoVO; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoForwardingUnitRankVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoGoodsNameStatisticVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoTodayStatisticVo; @@ -15,8 +19,10 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.Trend; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; @@ -200,4 +206,32 @@ public class WeighInfoController { return Result.success(weighInfoService.getWeighInfoForwardingUnitRank(map)); } + @ApiOperation(value = "统计发货单位（供应商排行）", notes = "统计发货单位（供应商排行）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countForwardingUnit") + public Result> countForwardingUnit(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(weighInfoService.countForwardingUnit(paramMap)); + } + + @ApiOperation(value = "统计称重记录（实时过磅）", notes = "统计称重记录（实时过磅）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countWeighInfo") + public Result countWeighInfo(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(weighInfoService.countWeighInfo(paramMap)); + } + + @ApiOperation(value = "统计货名（物料统计）", notes = "统计货名（物料统计）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countWeighInfoGoodsName") + public Result countWeighInfoGoodsName(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(weighInfoService.countWeighInfoGoodsName(paramMap)); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/vo/CountWeighInfoVO.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/vo/CountWeighInfoVO.java new file mode 100644 index 000000000..d001e103a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/vo/CountWeighInfoVO.java @@ -0,0 +1,20 @@ +package com.zhgd.xmgl.modules.weight.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountWeighInfoVO { + @ApiModelProperty("今日过磅") + private Double weighingToday; + @ApiModelProperty("今日预约") + private Double makeAnAppointmentToday; + @ApiModelProperty("累计过磅") + private Double accumulatedWeighing; + @ApiModelProperty("累计预约") + private Double cumulativeReservations; + @ApiModelProperty("本次过磅数") + private Double numberOfWeighThisTime; + @ApiModelProperty("车牌号") + private String numberPlate; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java index 5fb814458..4a5b7912c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java @@ -2,8 +2,10 @@ package com.zhgd.xmgl.modules.weight.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; import com.zhgd.xmgl.modules.weight.entity.bo.WeighingTypeStatisticBo; +import com.zhgd.xmgl.modules.weight.entity.vo.CountWeighInfoVO; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -27,4 +29,8 @@ public interface WeighBookVehicleInfoMapper extends BaseMapper getWeighingTypeStatistic(HashMap map); ArrayList pullList(HashMap paramMap); + + CountWeighInfoVO countWeighInfo(HashMap paramMap); + + List countWeighBookVehicleInfoTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighInfoMapper.java index fa23b927e..4c66ca122 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighInfoMapper.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.weight.mapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.modules.weight.entity.vo.CountWeighInfoVO; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoForwardingUnitRankVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoGoodsNameStatisticVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoTodayStatisticVo; @@ -26,4 +28,10 @@ public interface WeighInfoMapper extends BaseMapper { List getWeighInfoGoodsNameStatistic(HashMap map); List getWeighInfoForwardingUnitRank(HashMap map); + + List countForwardingUnit(HashMap paramMap); + + CountWeighInfoVO countWeighInfo(HashMap paramMap); + + List countWeighInfoGoodsName(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml index e68d34377..ec1623831 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml @@ -26,4 +26,36 @@ and vi.update_time ]]> #{beginTimestamp} limit 0,200 + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml index 49fdd6519..254587b16 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighInfoMapper.xml @@ -96,4 +96,26 @@ wi.forwarding_unit ORDER BY net_weight desc + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighBookVehicleInfoService.java b/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighBookVehicleInfoService.java index 9bcffd998..e5f83720c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighBookVehicleInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighBookVehicleInfoService.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.weight.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.weight.entity.bo.WeighingTypeStatisticBo; @@ -25,4 +26,6 @@ public interface IWeighBookVehicleInfoService extends IService map); PullListVo pullList(HashMap paramMap); + + List countWeighBookVehicleInfoTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighInfoService.java b/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighInfoService.java index 13a1de950..a50a1a17c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/service/IWeighInfoService.java @@ -2,8 +2,11 @@ package com.zhgd.xmgl.modules.weight.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.weight.entity.WeighInfo; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.weight.entity.vo.CountWeighInfoVO; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoForwardingUnitRankVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoGoodsNameStatisticVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoTodayStatisticVo; @@ -29,4 +32,10 @@ public interface IWeighInfoService extends IService { List getWeighInfoGoodsNameStatistic(HashMap map); List getWeighInfoForwardingUnitRank(HashMap map); + + List countForwardingUnit(HashMap paramMap); + + CountWeighInfoVO countWeighInfo(HashMap paramMap); + + SectorVo countWeighInfoGoodsName(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java index 6fa6339c4..9470876ec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; import com.zhgd.xmgl.modules.weight.entity.bo.WeighingTypeStatisticBo; import com.zhgd.xmgl.modules.weight.entity.vo.PullListVo; @@ -15,6 +16,7 @@ import com.zhgd.xmgl.modules.weight.entity.vo.WeighingTypeStatisticVo; import com.zhgd.xmgl.modules.weight.enums.WeighingTypeEnum; import com.zhgd.xmgl.modules.weight.mapper.WeighBookVehicleInfoMapper; import com.zhgd.xmgl.modules.weight.service.IWeighBookVehicleInfoService; +import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -118,4 +120,25 @@ public class WeighBookVehicleInfoServiceImpl extends ServiceImpl countWeighBookVehicleInfoTrend(HashMap paramMap) { + List list = baseMapper.countWeighBookVehicleInfoTrend(paramMap); + Integer type = MapUtils.getInteger(paramMap, "type"); + String format = null; + List dateTimeStrList = null; + if (Objects.equals(type, 1)) { + format = "HH:00"; + dateTimeStrList = DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"); + } else if (Objects.equals(type, 2)) { + format = "yyyy-MM-dd"; + dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); + } else if (Objects.equals(type, 3)) { + format = "yyyy-MM-dd"; + dateTimeStrList = DateUtils.getDateTimeStrList(80, "yyyy-MM-dd"); + } else { + return null; + } + return TrendVo.fillTrendVos(list, dateTimeStrList, format); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighInfoServiceImpl.java index 9e2640385..2fe841204 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighInfoServiceImpl.java @@ -7,15 +7,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.weight.entity.WeighInfo; import com.zhgd.xmgl.modules.weight.entity.WeighPic; +import com.zhgd.xmgl.modules.weight.entity.vo.CountWeighInfoVO; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoForwardingUnitRankVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoGoodsNameStatisticVo; import com.zhgd.xmgl.modules.weight.entity.vo.WeighInfoTodayStatisticVo; +import com.zhgd.xmgl.modules.weight.mapper.WeighBookVehicleInfoMapper; import com.zhgd.xmgl.modules.weight.mapper.WeighInfoMapper; import com.zhgd.xmgl.modules.weight.mapper.WeighPicMapper; import com.zhgd.xmgl.modules.weight.service.IWeighInfoService; -import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +41,8 @@ public class WeighInfoServiceImpl extends ServiceImpl> queryPageList(WeighInfo weighInfo, Integer pageNo, Integer pageSize, HttpServletRequest req) { @@ -88,4 +93,35 @@ public class WeighInfoServiceImpl extends ServiceImpl countForwardingUnit(HashMap paramMap) { + return baseMapper.countForwardingUnit(paramMap); + } + + @Override + public CountWeighInfoVO countWeighInfo(HashMap paramMap) { + String projectSn = MapUtils.getString(paramMap, "projectSn"); + CountWeighInfoVO countWeighInfoVO = baseMapper.countWeighInfo(paramMap); + CountWeighInfoVO c1 = weighBookVehicleInfoMapper.countWeighInfo(paramMap); + countWeighInfoVO.setMakeAnAppointmentToday(c1.getMakeAnAppointmentToday()); + countWeighInfoVO.setCumulativeReservations(c1.getCumulativeReservations()); + WeighInfo weighInfo = weighInfoMapper.selectOne(new LambdaQueryWrapper() + .eq(WeighInfo::getProjectSn, projectSn).orderByDesc(WeighInfo::getId).last("limit 1")); + if (weighInfo != null) { + try { + countWeighInfoVO.setNumberOfWeighThisTime(weighInfo.getGrossWeight().doubleValue()); + countWeighInfoVO.setNumberPlate(weighInfo.getLicensePlate()); + } catch (Exception e) { + e.printStackTrace(); + } + } + return countWeighInfoVO; + } + + @Override + public SectorVo countWeighInfoGoodsName(HashMap paramMap) { + List list = baseMapper.countWeighInfoGoodsName(paramMap); + return SectorVo.getSectorVo(list); + } + }