Skip to content

J
jyzb_platformV2
Commit 4195fcd3 by 李小惠
Options

添加浙江省大屏接口

parent 3c5c3bf7
正在显示 包含 155 行增加 和 34 行删除
app-log/error/log-error-2024-03-03.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_error.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-03-03.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/AreaDto.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/AreaChildrenDto.java
......@@ -2,19 +2,11 @@ package com.junmp.jyzb.api.bean.dto.LargeScreenDto;
import lombok.Data;
import java.util.List;
@Data
public class AreaDto {
private String findCode;
private Integer isMap;
private String orgCode;
private String orgName;
private Integer zsCount;
private List<ChildDto> children;
public static class ChildDto{
public class AreaChildrenDto {
private String id;
private String name;
private Integer zsCount;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/AreaTypeDto.java
package com.junmp.jyzb.api.bean.dto.LargeScreenDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
import lombok.Data;
import java.util.List;
......@@ -7,7 +8,7 @@ import java.util.List;
@Data
public class AreaTypeDto {
private List<AreaDto> data;
private List<TjOrgEqsDto> data;
private List<String> pList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/ContentChildrenDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.LargeScreenDto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ContentChildrenDto {
private Integer bfCount;
private Integer ckCount;
private String name;
private BigDecimal priceCount;
private Integer zkCount;
private Integer zsCount;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/ContentDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.LargeScreenDto;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class ContentDto {
private Integer bfCount;
private Integer ckCount;
private String findCode;
private String orgCode;
private String orgName;
private BigDecimal priceCount;
private Integer zkCount;
private Integer zsCount;
private List<ContentChildrenDto> children;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/SyWxBfDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.LargeScreenDto;
import lombok.Data;
import java.util.List;
@Data
public class SyWxBfDto {
private List<List<Integer>> dataType;
private List<String> pList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LargeScreenDto/TjOrgDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.LargeScreenDto;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class TjOrgDto {
private Integer bfCount;
private Integer ckCount;
private BigDecimal priceCount;
private Integer totalElements;
private Integer zkCount;
private Integer zsCount;
private List<ContentDto> content;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgEqsDto.java
package com.junmp.jyzb.api.bean.dto.TjDto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.AreaChildrenDto;
import lombok.Data;
import java.util.List;
......@@ -68,4 +69,6 @@ public class TjOrgEqsDto {
private List<TjOrgEqsDto> list;
private List<AreaChildrenDto> children;
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.AreaTypeDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.GroupByCountDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.Top5Dto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.*;
import com.junmp.jyzb.api.bean.dto.TjDto.*;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
......@@ -11,6 +9,7 @@ import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.jyzb.api.bean.query.WarehouseReq;
import com.junmp.jyzb.api.bean.req.WarrantyReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
import com.junmp.jyzb.service.TjService;
import com.junmp.jyzb.service.VieWarrantyGroupService;
......@@ -250,11 +249,17 @@ public class TjController {
//3.装备状态统计
@PostMapping("/GetCount")
@ApiOperation("装备状态统计")
public ApiRes<List<TjOutAndInDto>> GetCount(@RequestBody TjOrgCountReq req){
public ApiRes<List<InventorySummary>> GetCount(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.GetCount(req));
}
//4.近30天维修，使用，报废次数
@PostMapping("GetSyWxBf")
@ApiOperation("近30天维修，使用，报废次数")
public ApiRes<SyWxBfDto> GetSyWxBf(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.GetSyWxBf(req));
}
//5.区域装备
@PostMapping("/GetAreaType")
......@@ -263,5 +268,11 @@ public class TjController {
return ApiRes.success(tjService.GetAreaType(req));
}
//6。浙江省首页的装备数据
@PostMapping("/GetPageOrgTj")
@ApiOperation("浙江省首页的装备数据")
public ApiRes<TjOrgDto> GetPageOrgTj(@RequestBody TjOrgCountReq req ){
return ApiRes.success(tjService.GetPageOrgTj(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java
......@@ -175,6 +175,9 @@ public class InventorySummary implements Serializable {
@TableField("use_count")
private Integer useCount;
@TableField("broken_count")
private Integer brokenCount;
@TableField("fix_count")
private Integer fixCount;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.AreaDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.GroupByCountDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.Top5Dto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.*;
import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOutAndInDto;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
import com.junmp.jyzb.entity.EquipmentCountSummary;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.InventorySummary;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -98,11 +99,19 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
List<GroupByCountDto> GetGroupByCount(@Param("req") TjOrgCountReq req,@Param("length")Integer length);
List<TjOutAndInDto> GetCount(@Param("req") TjOrgCountReq req,@Param("length")Integer length);
List<InventorySummary> GetCount(@Param("req") TjOrgCountReq req, @Param("length")Integer length);
List<String> getTypeParentName();
List<AreaDto> GetAreaType(@Param("req")TjOrgCountReq req);
List<AreaChildrenDto> getChildren(@Param("dto")TjOrgEqsDto dto,@Param("levelFlag") Integer levelFlag);
List<Integer> GetSyWxBf(@Param("req") TjOrgCountReq req,@Param("length")Integer length,@Param("num") Integer num);
TjOrgDto GetPageOrgTj(@Param("req") TjOrgCountReq req);
List<ContentDto> getBydetail(@Param("req") TjOrgCountReq req);
List<ContentChildrenDto> getByChildren(@Param("dto") ContentDto dto);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.AreaTypeDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.GroupByCountDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.Top5Dto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.*;
import com.junmp.jyzb.api.bean.dto.TjDto.*;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
......@@ -79,7 +78,11 @@ public interface TjService {
List<GroupByCountDto> GetGroupByCount(TjOrgCountReq req);
List<TjOutAndInDto> GetCount(TjOrgCountReq req);
List<InventorySummary> GetCount(TjOrgCountReq req);
AreaTypeDto GetAreaType(TjOrgCountReq req);
SyWxBfDto GetSyWxBf(TjOrgCountReq req);
TjOrgDto GetPageOrgTj(TjOrgCountReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
......@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.EqsSumDto;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.AreaDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.AreaTypeDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.GroupByCountDto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.Top5Dto;
import com.junmp.jyzb.api.bean.dto.LargeScreenDto.*;
import com.junmp.jyzb.api.bean.dto.TjDto.*;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
......@@ -18,6 +15,7 @@ import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.jyzb.api.bean.vo.*;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.InventorySummaryService;
......@@ -1037,9 +1035,11 @@ public class TjServiceImpl implements TjService {
}
@Override
public List<TjOutAndInDto> GetCount(TjOrgCountReq req) {
public List<InventorySummary> GetCount(TjOrgCountReq req) {
int length = req.getFindCode().length();
return equipmentCountSummaryMapper.GetCount(req,length);
List<InventorySummary> tjOutAndInDtos = equipmentCountSummaryMapper.GetCount(req, length);
return tjOutAndInDtos;
}
@Override
......@@ -1049,14 +1049,50 @@ public class TjServiceImpl implements TjService {
//将九大类查询出来并且存入返回对象中去
List<String> typeNames = equipmentCountSummaryMapper.getTypeParentName();
AreaTypeDto areaTypeDto = new AreaTypeDto();
areaTypeDto.setPList(typeNames);
TjOrgEqsReq tjOrgEqsReq = new TjOrgEqsReq();
tjOrgEqsReq.setOrgId(pubOrg.getOrgId());
tjOrgEqsReq.setSizeNameList(new ArrayList<>());
tjOrgEqsReq.setTypeIdsList(new ArrayList<>());
List<TjOrgEqsDto> eqsDtoList = GetTjDataList(tjOrgEqsReq);
//将九大类汇总数据放入
for (TjOrgEqsDto dto:eqsDtoList) {
List<AreaChildrenDto> childrenDtoList=equipmentCountSummaryMapper.getChildren(dto,pubOrg.getLevelFlag());
dto.setChildren(childrenDtoList);
}
areaTypeDto.setData(eqsDtoList);
return areaTypeDto;
}
@Override
public SyWxBfDto GetSyWxBf(TjOrgCountReq req) {
SyWxBfDto syWxBfDto = new SyWxBfDto();
int length = req.getFindCode().length();
List<List<Integer>> reList=new ArrayList<>();
for (int i = 0; i < 3; i++) {
List<Integer> list=equipmentCountSummaryMapper.GetSyWxBf(req,length,i);
reList.add(list);
}
syWxBfDto.setDataType(reList);
List<String> typeNames = equipmentCountSummaryMapper.getTypeParentName();
syWxBfDto.setPList(typeNames);
return syWxBfDto;
}
@Override
public TjOrgDto GetPageOrgTj(TjOrgCountReq req) {
TjOrgDto tjOrgDto = equipmentCountSummaryMapper.GetPageOrgTj(req);
List<ContentDto> contentDtoList=equipmentCountSummaryMapper.getBydetail(req);
tjOrgDto.setContent(contentDtoList);
for (ContentDto dto:contentDtoList) {
List<ContentChildrenDto> childrenDtos=equipmentCountSummaryMapper.getByChildren(dto);
dto.setChildren(childrenDtos);
}
return tjOrgDto;
}
//-------------------------------------------人员统计报表----------------------------------------------------------
@Override
public PageResult<TjOrgPoliceDto> TjOrgPolice(TjOrgPoliceReq req) {
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -121,7 +121,7 @@
<insert id="SetWarehouseInventory">
INSERT INTO base_inventory_summary_type2 (id,org_id_int,org_name,org_code,location_id,location_name,type_id, type_name,size_id,
size_name,number,unit_price,price, stock_number, outbound_number,destruction_number,
expire_number,broken_number,use_number,near_broken_number,location_type,create_time,update_time)
expire_number,broken_number,use_number,fix_number,location_type,create_time,update_time)
select
MAX(t.id) as id,t.orgId,t.orgName,t.orgCode,t.locationId,MAX(t.locationName),t.type_id,t.typeName,t.size_id,t.sizeName,sum(t.number) as number,
t.unitPrice,sum(t.price)as price,sum(t.stockNumber)as stockNumber,sum(t.outboundNumber)as outboundNumber,
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -302,7 +302,7 @@
<select id="selectSumByItems" resultType="com.junmp.jyzb.entity.InventorySummary">
select id,valuekey,org_id_int as org_id,org_name,org_code,type_id,type_name,size_id,size_name,location_id,location_name,location_type,
number,unit_price,price,stock_number,outbound_number,destruction_price,destruction_number,expire_number,expire_price,
broken_price,broken_number,near_broken_price,near_broken_number,use_number,agent_broken_num,fix_count,use_count,create_time,update_time,threshold,property
broken_price,broken_number,fix_price,fix_number,use_number,agent_broken_num,fix_count,use_count,create_time,update_time,threshold,property
from base_inventory_summary where
<foreach collection="list" item="item" separator="or">
(
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论