Skip to content

J
jyzb_platformV2
Commit a2f0fe75 by 李小惠
Options

本地主机联调基础信息拉取

parent cecc114a
正在显示 包含 438 行增加 和 130 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/DeviceConfigInfoDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
import java.util.List;
public class DeviceConfigInfoDto {
private String deviceConfig;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/UserDto.java
......@@ -27,4 +27,5 @@ public class UserDto {
private Date updateTime;
private String roleCode;
private String roleName;
private Integer delFalg;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderMainDto.java
......@@ -84,7 +84,7 @@ public class OrderMainDto implements Serializable {
* 归还人，归还入库特有
*/
private String returnUserId;
private String returnUser;
/**
* 附件地址
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/WarehouseDevDto.java
......@@ -17,7 +17,7 @@ public class WarehouseDevDto {
/**
* 组织机构id
*/
private String orgId;
private Long orgId;
/**
* Ip地址
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventoryReq.java
......@@ -168,7 +168,7 @@ public class InventoryReq extends BaseRequest {
/**
* 更新时间
*/
private Date updateTime;
private Long updateTime;
/**
* 更新人员
......@@ -187,4 +187,7 @@ public class InventoryReq extends BaseRequest {
private Boolean isCreateNullDate;
private List<String> typeIdList;
private List<String> sizeIdList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PolicemanReq.java
......@@ -57,7 +57,7 @@ public class PolicemanReq extends BaseRequest {
private Date createTime;
private Date updateTime;
private Long updateTime;
private String idCard;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryWarehouseDevReq.java
......@@ -17,7 +17,7 @@ public class QueryWarehouseDevReq {
/**
* 组织机构id
*/
private String orgId;
private Long orgId;
/**
* Ip地址
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateDeivceConfigReq.java
......@@ -57,7 +57,7 @@ public class UpdateDeivceConfigReq implements Serializable {
/**
* 更新时间
*/
private Date updateTime;
private Long updateTime;
/**
* 创建人
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentSizeReq.java
......@@ -30,5 +30,5 @@ public class UpdateEquipmentSizeReq {
private String photo;
private String instructions;
private Date updateTime;
private Long updateTime;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentTypeReq.java
......@@ -37,5 +37,5 @@ public class UpdateEquipmentTypeReq {
private List<String> supplierList;
private Date updateTime;
private Long updateTime;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateSupplierReq.java
......@@ -32,5 +32,5 @@ public class UpdateSupplierReq {
@NotBlank(message = "状态不能为空", groups = {ValidationApi.updateStatus.class})
private Integer state;
private Date updateTime;
private Long updateTime;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseDevReq.java
......@@ -20,7 +20,7 @@ public class UpdateWarehouseDevReq {
* 组织机构id
*/
@NotNull(message = "组织机构id不能为空",groups = {ValidationApi.list.class})
private String orgId;
private Long orgId;
/**
* Ip地址
*/
......@@ -68,6 +68,6 @@ public class UpdateWarehouseDevReq {
private Date createTime;
private Date updateTime;
private Long updateTime;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseReq.java
......@@ -29,7 +29,7 @@ public class UpdateWarehouseReq extends BaseRequest {
private Date createTime;
private Date updateTime;
private Long updateTime;
private String updateUser;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/DeviceConfigController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.DeviceConfigInfoDto;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto;
import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
......@@ -76,4 +78,17 @@ public class DeviceConfigController {
public ApiRes<List<WarehouseDev>> showWarehouseDevList(@RequestBody @Validated(ValidationApi.list.class) UpdateWarehouseDevReq req){
return ApiRes.success(warehouseDevService.showWarehouseDevList(req));
}
@PostMapping("/alignDeviceConfigInfo")
@ApiOperation("同步更新通道/仓库主机配置")
public ApiRes<List<String>> alignDeviceConfigInfo(@RequestBody UpdateDeivceConfigReq req){
return ApiRes.success(deviceConfigService.alignDeviceConfigInfo(req));
}
@PostMapping("/alignWarehouseDevInfo")
@ApiOperation("同步更新除湿机配置")
public ApiRes<List<WarehouseDevInfoDto>> alignWarehouseDevInfo(@RequestBody UpdateWarehouseDevReq req){
return ApiRes.success(warehouseDevService.alignWarehouseDevInfo(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
......@@ -100,6 +100,26 @@ public class InventoryController {
return ApiRes.success(inventorySummaryService.getEquipmentInfo(req));
}
@PostMapping("/GetEquipmentSummary")
@ApiOperation("根据条件查询库存汇总信息（仅类型）")
public ApiRes<PageResult<InventorySummary>> GetEquipmentSummary(@RequestBody InventorySumReq req) {
return ApiRes.success(inventorySummaryService.GetEquipmentSummary(req));
}
@PostMapping("/GetEquipmentSummaryDetail")
@ApiOperation("根据条件查询库存汇总信息（号型）")
public ApiRes<List<InventorySummary>> GetEquipmentSummaryDetail(@RequestBody InventorySumReq req) {
return ApiRes.success(inventorySummaryService.GetEquipmentSummaryDetail(req));
}
//根据条件查询仓库/单警柜下的所有装备信息
@PostMapping("/GetDetailByTerms")
@ApiOperation("根据条件查询仓库/单警柜下的所有装备信息")
public ApiRes<PageResult<InventoryDto>> GetDetailByTerms(@RequestBody @Validated(ValidationApi.export.class) InventoryReq req){
return ApiRes.success(inventoryService.GetDetailByTerms(req));
}
@PostMapping("/getOne")
@ApiOperation("获取单个库存的数量")
public ApiRes<InventorySummary> getOne(@RequestBody InventorySumReq req){
......@@ -208,12 +228,7 @@ public class InventoryController {
return ApiRes.success(inventoryService.GetListEquipment(req));
}
//根据条件查询仓库/单警柜下的所有装备信息
@PostMapping("/GetDetailByTerms")
@ApiOperation("根据条件查询仓库/单警柜下的所有装备信息")
public ApiRes<PageResult<InventoryDto>> GetDetailByTerms(@RequestBody @Validated(ValidationApi.export.class) InventoryReq req){
return ApiRes.success(inventoryService.GetDetailByTerms(req));
}
/**
* 根据查询条件，查询出库存中的装备信息汇总，选择装备时使用该接口进行查询填写
......
jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java
......@@ -328,11 +328,11 @@ public class CounterSignListener implements ExecutionListener {
messageApi.sendMessage(sendReq);
messageApi.queryCount(new MessageReq());
/*推送发送未读数量*/
MessageReq req1 = new MessageReq();
req1.setReadFlag(0);
req1.setReceiveUserId(Long.valueOf(userId));
Integer count1 = messageApi.queryCount(req1);
messageApi.pushMsgToUser(userId,count1);
// MessageReq req1 = new MessageReq();
// req1.setReadFlag(0);
// req1.setReceiveUserId(Long.valueOf(userId));
// Integer count1 = messageApi.queryCount(req1);
// messageApi.pushMsgToUser(userId,count1);
}
});
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/DeviceConfigMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.DeviceConfigInfoDto;
import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
import com.junmp.jyzb.entity.DeviceConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......@@ -25,6 +27,10 @@ public interface DeviceConfigMapper extends BaseMapper<DeviceConfig> {
@Param("deviceCode") String deviceCode,
@Param("pageNo") Long pageNo,
@Param("pageSize") Long pageSize);
List<String> alignDeviceConfigInfo(@Param("orgId") Long orgId,
@Param("deviceCode") String deviceCode,
@Param("date") String date);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentSizeMapper.java
......@@ -37,5 +37,5 @@ public interface EquipmentSizeMapper extends BaseMapper<EquipmentSize> {
//根据typeId返回号型名称
List<String> searchByTypeIds(@Param("list") List<String> typeIdsList);
List<SizeDto> alignSizeInfo(@Param("req") UpdateEquipmentSizeReq req);
List<SizeDto> alignSizeInfo(@Param("date") String date);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java
......@@ -25,5 +25,5 @@ public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
@Param("list3") List<String> list3,
@Param("list4") List<String> list4);
List<TypeDto> alignTypeInfo(@Param("req") UpdateEquipmentTypeReq req);
List<TypeDto> alignTypeInfo(@Param("date") String date);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java
......@@ -13,6 +13,8 @@ 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 liquibase.pro.packaged.L;
import liquibase.pro.packaged.S;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -79,7 +81,11 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
List<Inventory> searchExpireEqs(@Param("list") List<Object[]> searchItem);
IPage<InventoryDto> GetDetailByTerms(@Param("page") Page<Object> defaultPage, @Param("req") InventoryReq req);
List<EquipmentDto> alignInventoryInfo(@Param("orgId")Long orgId,
@Param("locationId") String locationId,
@Param("date")String date,
@Param("typeIdList")List<String> typeIdList,
@Param("sizeIdList")List<String> sizeIdList);
List<EquipmentDto> alignInventoryInfo(@Param("req") InventoryReq req);
IPage<InventoryDto> GetDetailByTerms(@Param("page") Page<Object> defaultPage, @Param("req") InventoryReq req);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
......@@ -8,6 +8,7 @@ import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
import com.junmp.jyzb.entity.InventorySummary;
import liquibase.pro.packaged.L;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -66,4 +67,12 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
List<InventorySumDto> selectTotalNum(@Param("orgId") Long orgId,@Param("list") List<Object[]> searchCriteria );
int GetEquipmentSummarySum(@Param("req") InventorySumReq req);
List<InventorySummary> GetEquipmentSummary(@Param("req") InventorySumReq req,
@Param("pageNo") Long pageNo,
@Param("pageSize") Long pageSize);
List<InventorySummary> GetEquipmentSummaryDetail(@Param("req") InventorySumReq req);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
......@@ -13,6 +13,7 @@ import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.v2.sys.api.bean.user.SysUserDto;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import liquibase.pro.packaged.S;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
......@@ -58,5 +59,5 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
@Param("state")Integer state,
@Param("phone")String phone,@Param("flag") String flag);
List<UserDto> alignUserInfo(@Param("req") PolicemanReq req);
List<UserDto> alignUserInfo(@Param("orgId") Long orgId, @Param("date")String date);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierMapper.java
......@@ -8,6 +8,7 @@ import com.junmp.jyzb.entity.Supplier;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
@Mapper
......@@ -15,5 +16,5 @@ public interface SupplierMapper extends BaseMapper<Supplier> {
List<SupplierDto> selectDistinctList();
List<SupplierInfoDto> alignSupplierInfo(@Param("req") UpdateSupplierReq req);
List<SupplierInfoDto> alignSupplierInfo(@Param("date") String date);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseDevMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
import com.junmp.jyzb.entity.WarehouseDev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -16,6 +17,8 @@ import java.util.List;
public interface WarehouseDevMapper extends BaseMapper<WarehouseDev> {
List<WarehouseDev> showWarehouseDevList(@Param("req") UpdateWarehouseDevReq req);
List<WarehouseDevInfoDto> alignWarehouseDevInfo(@Param("orgId") Long orgId,@Param("date") String date);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseMapper.java
......@@ -30,5 +30,5 @@ public interface WarehouseMapper extends BaseMapper<Warehouse> {
boolean SetInventoryInfo(String id);
List<WarehouseInfoDto> alignWarehouseInfo(@Param("req") UpdateWarehouseReq req);
List<WarehouseInfoDto> alignWarehouseInfo(@Param("orgId") Long orgId,@Param("date") String date);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/DeviceConfigService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.DeviceConfigInfoDto;
import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
......@@ -27,4 +28,5 @@ public interface DeviceConfigService extends IService<DeviceConfig> {
List<DeviceConfig> showDeviceConfigList(QueryDeviceConfigReq req);
List<String> alignDeviceConfigInfo(UpdateDeivceConfigReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java
......@@ -56,5 +56,8 @@ public interface InventorySummaryService extends IService<InventorySummary> {
*/
void updateCount();
//根据条件查询库存汇总信息（仅类型）
PageResult<InventorySummary> GetEquipmentSummary(InventorySumReq req);
List<InventorySummary> GetEquipmentSummaryDetail(InventorySumReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/WarehouseDevService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
import com.junmp.jyzb.entity.WarehouseDev;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -19,4 +20,5 @@ public interface WarehouseDevService extends IService<WarehouseDev> {
List<WarehouseDev> showWarehouseDevList(UpdateWarehouseDevReq req);
List<WarehouseDevInfoDto> alignWarehouseDevInfo(UpdateWarehouseDevReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/DeviceConfigServiceImpl.java
......@@ -4,6 +4,7 @@ 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.DeviceConfigInfoDto;
import com.junmp.jyzb.api.bean.query.QueryDeviceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateDeivceConfigReq;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
......@@ -22,6 +23,7 @@ import net.minidev.json.writer.BeansMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.List;
/**
......@@ -43,6 +45,7 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
DeviceConfig deviceConfig = new DeviceConfig();
BeanPlusUtil.copyProperties(req,deviceConfig);
deviceConfig.setCreateTime(DateTimeUtil.getCurrentDateTime());
deviceConfig.setUpdateTime(DateTimeUtil.getCurrentDateTime());
save(deviceConfig);
return deviceConfig.getId() ;
}
......@@ -78,6 +81,13 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
}
@Override
public List<String> alignDeviceConfigInfo(UpdateDeivceConfigReq req) {
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
return deviceConfigMapper.alignDeviceConfigInfo(req.getOrgId(), req.getDeviceCode(), date);
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java
......@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.EquipmentSizeMapper;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
......@@ -147,8 +148,8 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
@Override
public List<SizeDto> alignSizeInfo(UpdateEquipmentSizeReq req) {
return equipmentSizeMapper.alignSizeInfo(req);
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
return equipmentSizeMapper.alignSizeInfo(date);
}
public List<String> selectByTypeIds(List<String> typeIdsList){
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
......@@ -27,6 +27,7 @@ import com.junmp.jyzb.mapper.EquipmentTypeMapper;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
......@@ -419,8 +420,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
@Override
public List<TypeDto> alignTypeInfo(UpdateEquipmentTypeReq req) {
return equipmentTypeMapper.alignTypeInfo(req);
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
return equipmentTypeMapper.alignTypeInfo(date);
}
private EquipmentTreeDto convertNode(EquipmentType entity, List<EquipmentType> entityList,Integer type) {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -22,6 +22,7 @@ import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.InventorySummaryMapper;
import com.junmp.jyzb.mapper.LogSummaryMapper;
import com.junmp.jyzb.service.*;
import com.junmp.jyzb.utils.DateTimeUtil;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.common.util.HttpServletUtil;
......@@ -46,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
import com.junmp.jyzb.mapper.InventoryMapper;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
......@@ -599,8 +601,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
@Override
public List<EquipmentDto> alignInventoryInfo(InventoryReq req) {
return inventoryMapper.alignInventoryInfo(req);
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
return inventoryMapper.alignInventoryInfo(req.getOrgId(),req.getLocationId(),date,req.getTypeIdList(),req.getSizeIdList());
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java
......@@ -107,24 +107,41 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
}
LambdaQueryWrapper<InventorySummary> wp = createWrapper(req);//取出仓库中总数并计算
Page<InventorySummary> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wp);
// List<InventorySummary> list = list(wp);
// long size = list(wp).size();
//对该装备typeId进行排序
// Collections.sort(list, new Comparator<InventorySummary>() {
// @Override
// public int compare(InventorySummary o1, InventorySummary o2) {
// return o1.getTypeId().compareTo(o2.getTypeId());
// }
// });
// Page<InventorySummary> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
// page1.setRecords(list);
// page1.setTotal(size);
return PageResultFactory.createPageResult(page);
}
@Override
public PageResult<InventorySummary> GetEquipmentSummary(InventorySumReq req) {
//(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
//修改字段，和数据库字段进行统一
req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder(req.getOrder().toLowerCase());
}
int size=inventorySummaryMapper.GetEquipmentSummarySum(req);
List<InventorySummary> list=inventorySummaryMapper.GetEquipmentSummary(req,(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
Page<InventorySummary> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
page.setRecords(list);
page.setTotal(size);
return PageResultFactory.createPageResult(page);
}
@Override
public List<InventorySummary> GetEquipmentSummaryDetail(InventorySumReq req) {
//(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
//修改字段，和数据库字段进行统一
req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder(req.getOrder().toLowerCase());
}
return inventorySummaryMapper.GetEquipmentSummaryDetail(req);
}
@Override
public List<InventorySummary> getEquipmentInfoList(InventorySumReq req) {
//当没有参数传递的时候默认查询全部，但是如果传递了条件，根据条件查询并且如果是根据id进行查询，则需要判断该id是否存在
//(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
......@@ -56,9 +59,11 @@ import com.junmp.v2.sys.user.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
......@@ -1354,26 +1359,42 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
.eq(Policeman::getOrgId, req.getOrgId())
.ge(Policeman::getUpdateTime, req.getUpdateTime());
List<Policeman> list = list(eq);
List<PoliceDto> returnList = list.stream().map(policeman -> {
PoliceDto policeDto = new PoliceDto();
BeanPlusUtil.copyProperties(policeman, policeDto);
LambdaQueryWrapper<PoliceFinger> wq = new LambdaQueryWrapper<PoliceFinger>()
.eq(PoliceFinger::getPoliceId, policeman.getId());
List<PoliceFinger> list1 = policeFingerService.list(wq);
List<PoliceFingerDto> collect = list1.stream().map(policeFinger -> {
List<PoliceDto> returnList=new ArrayList<>();
List<String> policeIdList = list.stream().map(Policeman::getId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(policeIdList)){
List<PoliceFinger> list1 = policeFingerService.list(Wrappers.<PoliceFinger>lambdaQuery().in(PoliceFinger::getPoliceId, policeIdList));
Map<String, List> map = new HashMap<>();
for (PoliceFinger pf:list1) {
PoliceFingerDto policeFingerDto = new PoliceFingerDto();
BeanPlusUtil.copyProperties(policeFinger, policeFingerDto);
return policeFingerDto;
}).collect(Collectors.toList());
policeDto.setFingersList(collect);
return policeDto;
}).collect(Collectors.toList());
BeanPlusUtil.copyProperties(pf, policeFingerDto);
String policeId = pf.getPoliceId();
List<PoliceFingerDto> list2 = map.get(policeId);
if (CollectionUtil.isNotEmpty(list2)){
list2.add(policeFingerDto);
map.put(policeId,list2);
} else {
List<PoliceFingerDto> list3 = new ArrayList<>();
list3.add(policeFingerDto);
map.put(policeId,list3);
}
}
for (Policeman p:list) {
PoliceDto policeDto = new PoliceDto();
BeanPlusUtil.copyProperties(p, policeDto);
List<PoliceFingerDto> list2 = map.get(p.getId());
policeDto.setFingersList(list2);
returnList.add(policeDto);
}
}
return returnList;
}
@Override
public List<UserDto> alignUserInfo(PolicemanReq req) {
return policemanMapper.alignUserInfo(req);
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
Long orgId = req.getOrgId();
return policemanMapper.alignUserInfo(orgId,date);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
......@@ -22,6 +22,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.SupplierMapper;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
......@@ -137,7 +139,8 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
@Override
public List<SupplierInfoDto> alignSupplierInfo(UpdateSupplierReq req) {
return supplierMapper.alignSupplierInfo(req);
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
return supplierMapper.alignSupplierInfo(date);
}
@Override
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseDevServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto;
import com.junmp.jyzb.api.bean.req.UpdateWarehouseDevReq;
import com.junmp.jyzb.entity.WarehouseDev;
import com.junmp.jyzb.service.WarehouseDevService;
......@@ -10,6 +12,7 @@ import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.List;
/**
......@@ -32,6 +35,7 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War
WarehouseDev warehouseDev = new WarehouseDev();
BeanPlusUtil.copyProperties(req,warehouseDev);
warehouseDev.setCreateTime(DateTimeUtil.getCurrentDateTime());
warehouseDev.setUpdateTime(DateTimeUtil.getCurrentDateTime());
warehouseDevService.save(warehouseDev);
return warehouseDev.getId();
}
......@@ -49,6 +53,12 @@ public class WarehouseDevServiceImpl extends ServiceImpl<WarehouseDevMapper, War
return warehouseDevMapper.showWarehouseDevList(req);
}
@Override
public List<WarehouseDevInfoDto> alignWarehouseDevInfo(UpdateWarehouseDevReq req) {
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
return warehouseDevMapper.alignWarehouseDevInfo(req.getOrgId(),date);
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java
......@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
......@@ -158,7 +159,11 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
@Override
public List<WarehouseInfoDto> alignWarehouseInfo(UpdateWarehouseReq req) {
return warehouseMapper.alignWarehouseInfo(req);
String date = DateTimeUtil.TimeLongToString(req.getUpdateTime());
Long orgId = req.getOrgId();
return warehouseMapper.alignWarehouseInfo(orgId,date);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/utils/DateTimeUtil.java
package com.junmp.jyzb.utils;
import cn.hutool.core.util.ObjectUtil;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -31,4 +33,17 @@ public class DateTimeUtil {
return allPoliceman;
}
//时间戳转时间(String类型)
public static String TimeLongToString(Long time){
//时间戳转时间Date
if (ObjectUtil.isNotNull(time)){
Date updateTime = new Date(time*1000);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date= format.format(updateTime);
return date;
}else {
return null;
}
}
}
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/DeviceConfigMapper.xml
......@@ -58,4 +58,16 @@
</if>
) as a
</select>
<select id="alignDeviceConfigInfo" resultType="java.lang.String">
select device_config from base_device_config where org_id=#{orgId}
<if test="deviceCode != null and deviceCode != ''">
and device_code=#{deviceCode}
</if>
<if test="deviceCode == null or deviceCode == ''">
and device_type=0
</if>
<if test="date != null and date!= ''">
and update_time &gt; #{date}
</if>
</select>
</mapper>
jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml
......@@ -65,12 +65,9 @@
</select>
<select id="alignSizeInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto"
parameterType="com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq">
select * from base_equipment_size where
<if test="req.updateTime!=null and req.updateTime !=''">
update_time &gt; #{req.updateTime}
</if>
<if test="req.updateTime==null and req.updateTime ==''">
1=1
select * from base_equipment_size where 1=1
<if test="date!=null and date !=''">
and update_time &gt; #{date}
</if>
</select>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/EquipmentTypeMapper.xml
......@@ -82,15 +82,11 @@
</foreach>
</if>
</select>
<select id="alignTypeInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto"
parameterType="com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq">
select id,name,unit,uint_type,parent_id,parent_ids,code,state,note,guid,type,create_time,update_time
from base_equipment_type where
<if test="req.updateTime!=null and req.updateTime !=''">
update_time &gt; #{req.updateTime}
</if>
<if test="req.updateTime==null and req.updateTime ==''">
1=1
<select id="alignTypeInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto">
select id,name,unit,unit_type,parent_id,parent_ids,code,state,note,guid,type,create_time,update_time
from base_equipment_type where 1=1
<if test="date!=null and date !=''">
and update_time &gt; #{date}
</if>
</select>
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -559,11 +559,25 @@
join base_equipment_type et on i.type_id=et.id
join base_warehouse bw on bw.id=i.location_id
join base_supplier bs on bs.id=i.supplier_id
where i.org_id_int=#{req.orgId}
<if test="req.locationId!= null and req.locationId != ''">
and i.location_id=#{req.locationId}
where i.org_id_int=#{orgId}
<if test="locationId!= null and locationId != ''">
and i.location_id=#{locationId}
</if>
and i.update_time &gt; #{req.updateTime}
<if test="date!= null and date != ''">
and i.update_time &gt; #{date}
</if>
<if test="typeIdList != null and typeIdList.size()>0">
and type_id in
<foreach collection="typeIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeIdList != null and sizeIdList.size()>0">
and size_id in
<foreach collection="sizeIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -514,5 +514,90 @@
ORDER BY type_id
) as t
</select>
<select id="GetEquipmentSummarySum" resultType="java.lang.Integer"
parameterType="com.junmp.jyzb.api.bean.query.InventorySumReq">
select count(*) from (
SELECT
is.type_id,
is.type_name,
sum( is.number ) AS number,
sum( is.number * is.unit_price ) AS price,
sum( is.stock_number ) AS stock_number,
sum( is.stock_number * is.unit_price ) AS stock_number_price,
sum( is.outbound_number ) AS outbound_number,
sum( is.outbound_number * is.unit_price ) AS outbound_number_price,
sum( is.destruction_number ) AS destruction_number,
sum( is.destruction_number * is.unit_price ) AS destruction_number_price ,
sum( is.expire_number) as expire_number,
sum( is.expire_number * is.unit_price ) AS expire_number_price ,
sum( is.broken_number) as broken_number,
sum( is.broken_number * is.unit_price ) AS broken_number_price
FROM
base_inventory_summary `is`
join base_equipment_type et on is.type_id=et.id
WHERE
is.org_id_int = #{req.oegId}
<if test="req.typeIds !=null and req.typeIds.size()>0">
and (
<foreach collection="req.typeIds" item="item" open="(" separator="or" close=")">
et.id=#{item} or et.parent_ids like CONCAT('%', #{item}, '%')
</foreach>
)
</if>
GROUP BY
is.type_id,
is.type_name
ORDER BY
is.type_id
) as a
</select>
<select id="GetEquipmentSummary" resultType="com.junmp.jyzb.entity.InventorySummary">
SELECT
is.type_id,
is.type_name,
sum( is.number ) AS number,
sum( is.number * is.unit_price ) AS price,
sum( is.stock_number ) AS stock_number,
sum( is.stock_number * is.unit_price ) AS stock_number_price,
sum( is.outbound_number ) AS outbound_number,
sum( is.outbound_number * is.unit_price ) AS outbound_number_price,
sum( is.destruction_number ) AS destruction_number,
sum( is.destruction_number * is.unit_price ) AS destruction_number_price ,
sum( is.expire_number) as expire_number,
sum( is.expire_number * is.unit_price ) AS expire_number_price ,
sum( is.broken_number) as broken_number,
sum( is.broken_number * is.unit_price ) AS broken_number_price
FROM
base_inventory_summary `is`
join base_equipment_type et on is.type_id=et.id
WHERE
is.org_id_int = #{req.oegId}
<if test="req.typeIds !=null and req.typeIds.size()>0">
and (
<foreach collection="req.typeIds" item="item" open="(" separator="or" close=")">
et.id=#{item} or et.parent_ids like CONCAT('%', #{item}, '%')
</foreach>
)
</if>
<if test="req.locationType!= null or req.locationType !=''">
and is.location_type=#{req.locationType}
</if>
GROUP BY
is.type_id,
is.type_name
<if test="req.column != create_time ">
order by ${req.column} ${req.order}
</if>
<if test="req.column == create_time ">
order by is.type_id asc
</if>
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if>
</select>
<select id="GetEquipmentSummaryDetail" resultType="com.junmp.jyzb.entity.InventorySummary"
parameterType="com.junmp.jyzb.api.bean.query.InventorySumReq">
</select>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
......@@ -105,7 +105,7 @@
<if test="req.column != null and req.column != '' and req.order != null and req.order != '' ">
order by ${req.column} ${req.order}
</if>
<if test="(req.column == null || req.column == '') and (req.order == null || req.order == '') ">
<if test="(req.column == null or req.column == '') and (req.order == null or req.order == '') ">
order by create_time desc
</if>
</select>
......
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -319,9 +319,9 @@ WHERE o.org_id IN
<select id="alignUserInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto"
parameterType="com.junmp.jyzb.api.bean.query.PolicemanReq">
SELECT su.* FROM `sys_user` su
join sys_user_org suo on su.user_id=suo.user_id and suo.org_id=#{req.orgId}
<if test="req.updateTime !=null and req.updateTime != ''">
where su.update_time &gt; #{req.updateTime}
join sys_user_org suo on su.user_id=suo.user_id and suo.org_id=#{orgId}
<if test="date !=null and date != ''">
where su.update_time &gt; #{date}
</if>
</select>
......
jyzb-biz/src/main/resources/mapper/SupplierMapper.xml
......@@ -26,12 +26,9 @@
<select id="alignSupplierInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto"
parameterType="com.junmp.jyzb.api.bean.req.UpdateSupplierReq">
select id,name,code,short_name,contacts,phone,create_time,create_user,update_time,state
from base_supplier where
<if test="req.updateTime!=null and req.updateTime !=''">
update_time &gt; #{req.updateTime}
</if>
<if test="req.updateTime==null and req.updateTime ==''">
1=1
from base_supplier where 1=1
<if test="date!=null and date !=''">
and update_time &gt;= #{date}
</if>
</select>
......
jyzb-biz/src/main/resources/mapper/WarehouseDevMapper.xml
......@@ -40,4 +40,11 @@
and wd.dev_code =#{req.devCode}
</if>
</select>
<select id="alignWarehouseDevInfo"
resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseDevInfoDto">
select * from base_warehouse_dev where org_id=#{orgId}
<if test="date!=null and date != ''">
and update_time &gt; #{date}
</if>
</select>
</mapper>
jyzb-biz/src/main/resources/mapper/WarehouseMapper.xml
......@@ -85,10 +85,10 @@
</select>
<select id="alignWarehouseInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto"
parameterType="com.junmp.jyzb.api.bean.req.UpdateWarehouseReq">
select id,name,location,phone,is_locked,org_id,state from base_warehouse
where org_id =#{req.oegId}
<if test="req.updateTime !=null and req.updateTime !=''">
and update_time &gt; #{req.updateTime}
select id,name,location,phone,is_locked,org_id_int as org_id,state from base_warehouse
where org_id_int =#{orgId}
<if test="date !=null and date !=''">
and update_time &gt; #{date}
</if>
</select>
......
jyzb-common/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>junmp-jyzb-app</artifactId>
<groupId>com.junmp.jyzb</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jyzb-common</artifactId>
<dependencies>
<!--fastJson-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.83</version>
</dependency>
<!-- jwt -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!-- &lt;!&ndash; SpringBoot 测试 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-test</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.swagger</groupId>-->
<!-- <artifactId>swagger-annotations</artifactId>-->
<!-- <version>1.5.22</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-web</artifactId>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; SpringBoot集成mybatis框架 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
<!-- <version>3.5.2</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.junmp.jyzb</groupId>-->
<!-- <artifactId>jyzb-boot</artifactId>-->
<!-- <version>1.0.0</version>-->
<!-- </dependency>-->
</dependencies>
</project>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
......@@ -481,21 +481,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
taskVOS.add(taskVO);
}
// //余数
long num= count % 10;
//整数
long integer=count / 10;
List<TaskVO> taskVOList=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(taskDTO.getPageNo()-1==integer){
for (int i = 0; i < 10-num; i++) {
TaskVO taskVO=new TaskVO();
taskVOList.add(taskVO);
}
}
taskVOS.addAll(taskVOList);
}
//判断是否需要添加空数据
if(taskDTO.getIsCreateNullDate()==null || taskDTO.getIsCreateNullDate()){
......@@ -617,21 +602,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskVO.setDuration(spendTimes);
taskVOS.add(taskVO);
}
//余数
long num= count % 10;
//整数
long integer=count / 10;
List<TaskVO> taskVOList=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(taskDTO.getPageNo()-1==integer){
for (int i = 0; i < 10-num; i++) {
TaskVO taskVO = new TaskVO();
taskVOList.add(taskVO);
}
}
taskVOS.addAll(taskVOList);
}
//判断是否需要添加空数据
if(taskDTO.getIsCreateNullDate()==null || taskDTO.getIsCreateNullDate()){
......@@ -661,7 +631,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
PageResult<HistoryProcessInstanceVO> pageResult=new PageResult<HistoryProcessInstanceVO>();
HistoricProcessInstanceQuery desc = historyService.createHistoricProcessInstanceQuery()
.includeProcessVariables()
.includeProcessVariables().processInstanceId(applyDTO.getProcessId())
.startedBy(StartUser.getUserId().toString())
.orderByProcessInstanceStartTime().desc();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论