Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/WarrantyDataDto.java

+package com.junmp.jyzb.api.bean.dto.TjDto;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+
+@Data
+public class WarrantyDataDto  {
+
+    private String warrantyType;
+    private String warehouseId;
+    private String warehouseName;
+    private String countOfItems;
+    private String sizeId;
+    private String sizeName;
+    private String typeId;
+    private String typeName;
+    private String days;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/WarrantyReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.jyzb.api.bean.dto.EquipmentListDto;
+import com.junmp.v2.common.bean.request.BaseRequest;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+
+@Data
+public class WarrantyReq  extends BaseRequest {
+    @NotBlank(message = "组织机构不能为空",groups = {ValidationApi.page.class})
+    private String orgId;
+    private String warrantyType;
+    private String warrantyDays;
+    private String typeId;
+    private String sizeId;
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java

@@ -7,8 +7,10 @@ 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.query.WarehouseReq;
+import com.junmp.jyzb.api.bean.req.WarrantyReq;
 import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
 import com.junmp.jyzb.service.TjService;
+import com.junmp.jyzb.service.VieWarrantyGroupService;
 import com.junmp.jyzb.service.WarehouseService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -36,7 +38,8 @@ public class TjController {
 
     @Resource
     public WarehouseService warehouseService;
-
+    @Resource
+    public VieWarrantyGroupService vieWarrantyGroupService;
     /**
      * ------------------------------------装备统计报表--------------------------------------------
      */
@@ -217,7 +220,11 @@ public class TjController {
         warehouseService.HumidityAndtemperatureExport(req);
     }
 
-
+    @PostMapping(path="/WarrantyData",name="超期装备查询")
+    @ApiOperation("超期装备查询")
+    public ApiRes<PageResult<WarrantyDataDto>>  WarrantyData(@RequestBody  @Validated(ValidationApi.page.class) WarrantyReq req){
+        return ApiRes.success(vieWarrantyGroupService.WarrantyData(req));
+    }
 
 
     @PostMapping("/test")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/VieWarrantyGroup.java

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("vie_warranty_group")
+public class VieWarrantyGroup implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @TableField("size_name")
+    private String sizeName;
+
+    @TableField("type_name")
+    private String typeName;
+
+    @TableField("type_id")
+    private String typeId;
+
+    @TableField("size_id")
+    private String sizeId;
+
+    @TableField("days")
+    private String days;
+
+    @TableField("warranty_type")
+    private String warrantyType;
+
+    @TableField("org_name")
+    private String orgName;
+
+    @TableField("org_id")
+    private String orgId;
+
+    @TableField("count_of_items")
+    private String countOfItems;
+
+    @TableField("warehouse_id")
+    private String warehouseId;
+
+    @TableField("warehouse_name")
+    private String warehouseName;
+
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/MsgMapper.java

@@ -8,7 +8,5 @@ import java.util.Map;
 
 @Mapper
 public interface MsgMapper {
-    List<Map<String, Object>> getMsg(@Param("orgId") String orgId,@Param("tableName") String tableName);
 
-    List<Map<String, Object>> getUserMsg(String orgId);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/VieWarrantyGroupMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.junmp.jyzb.api.bean.dto.EqsSumDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
+import com.junmp.jyzb.api.bean.dto.InventoryDto;
+import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
+import com.junmp.jyzb.api.bean.req.InvExpireReq;
+import com.junmp.jyzb.api.bean.vo.InventoryVo;
+import com.junmp.jyzb.entity.Inventory;
+import com.junmp.jyzb.entity.InventorySummary;
+import com.junmp.jyzb.entity.VieWarrantyGroup;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface VieWarrantyGroupMapper extends BaseMapper<VieWarrantyGroup> {
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/VieWarrantyGroupService.java

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
+import com.junmp.jyzb.api.bean.req.WarrantyReq;
+import com.junmp.jyzb.entity.VieWarrantyGroup;
+import com.junmp.v2.db.api.page.PageResult;
+
+public interface VieWarrantyGroupService extends IService<VieWarrantyGroup> {
+
+    PageResult<WarrantyDataDto> WarrantyData(WarrantyReq req);
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/WarehouseService.java

@@ -2,14 +2,18 @@ package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
 import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
+import com.junmp.jyzb.api.bean.req.WarrantyReq;
+import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
 import com.junmp.jyzb.entity.Warehouse;
 import com.junmp.jyzb.utils.ResponseResult;
+import com.junmp.v2.db.api.page.PageResult;
 
 import java.util.List;
 import java.util.Map;
@@ -59,4 +63,5 @@ public interface WarehouseService extends IService<Warehouse> {
     List<HumidityAndtemperature> showHumidityAndtemperature(WarehouseReq req);
 
     void HumidityAndtemperatureExport(WarehouseReq req);
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/VieWarrantyGroupServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.dto.InventoryDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
+import com.junmp.jyzb.api.bean.req.WarrantyReq;
+import com.junmp.jyzb.entity.Inventory;
+import com.junmp.jyzb.entity.VieWarrantyGroup;
+import com.junmp.jyzb.entity.Warehouse;
+import com.junmp.jyzb.mapper.VieWarrantyGroupMapper;
+import com.junmp.jyzb.mapper.WarehouseMapper;
+import com.junmp.jyzb.service.VieWarrantyGroupService;
+import com.junmp.jyzb.service.WarehouseService;
+import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.db.api.factory.PageFactory;
+import com.junmp.v2.db.api.factory.PageResultFactory;
+import com.junmp.v2.db.api.page.PageResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class VieWarrantyGroupServiceImpl extends ServiceImpl<VieWarrantyGroupMapper, VieWarrantyGroup> implements VieWarrantyGroupService {
+
+
+    @Override
+    public PageResult<WarrantyDataDto> WarrantyData(WarrantyReq req) {
+        LambdaQueryWrapper<VieWarrantyGroup> wrapper = createWrapper(req);
+        Page<VieWarrantyGroup> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);
+        List<VieWarrantyGroup> records = page.getRecords();
+        long size = list(wrapper).size();
+        List<WarrantyDataDto> collect = records.parallelStream()
+                .map(vieWarrantyGroup -> {
+                    WarrantyDataDto warrantyDataDto = new WarrantyDataDto();
+                    BeanPlusUtil.copyProperties(vieWarrantyGroup, warrantyDataDto);
+                    return warrantyDataDto;
+                }).collect(Collectors.toList());
+        Page<WarrantyDataDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
+        page1.setRecords(collect);
+        page1.setTotal(size);
+        return PageResultFactory.createPageResult(page1);
+    }
+    private LambdaQueryWrapper<VieWarrantyGroup> createWrapper(WarrantyReq req) {
+        LambdaQueryWrapper<VieWarrantyGroup> wrapper = new LambdaQueryWrapper<>();
+        if (ObjectUtil.isEmpty(req)) {
+            return wrapper;
+        }
+
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), VieWarrantyGroup::getOrgId, req.getOrgId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), VieWarrantyGroup::getSizeId, req.getSizeId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getTypeId()), VieWarrantyGroup::getTypeId, req.getTypeId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getWarrantyType()), VieWarrantyGroup::getWarrantyType, req.getWarrantyType());
+        if (ObjectUtil.isNotEmpty(req.getWarrantyDays())) {
+            int warrantyDays = Integer.parseInt(req.getWarrantyDays());
+            wrapper.and(w ->
+                    w.ge(VieWarrantyGroup::getDays, -warrantyDays)
+                            .le(VieWarrantyGroup::getDays, warrantyDays)
+            );
+        }
+        return wrapper;
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java

@@ -3,14 +3,19 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto;
 import com.junmp.jyzb.api.bean.dto.MQDto;
+import com.junmp.jyzb.api.bean.dto.OrderMainDto;
+import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
+import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
 import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
+import com.junmp.jyzb.api.bean.req.WarrantyReq;
 import com.junmp.jyzb.api.bean.vo.InOrderInfoVo;
 import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
 import com.junmp.jyzb.cache.TemperatureRedisCache;
@@ -24,6 +29,9 @@ import com.junmp.jyzb.utils.*;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.common.util.HttpServletUtil;
+import com.junmp.v2.db.api.factory.PageFactory;
+import com.junmp.v2.db.api.factory.PageResultFactory;
+import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.office.api.OfficeExcelApi;
 import com.junmp.v2.office.api.bean.ExcelExportParam;
 import lombok.extern.slf4j.Slf4j;
@@ -282,4 +290,9 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
 
     }
 
+
+
+
+
+
 }

jyzb-boot/src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.128:3306/db_jyzb_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: root
     password: 123456