admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

港投-接口改模糊查询

Browse Source
This commit is contained in:
Administrator 2023-04-20 09:44:27 +08:00
parent db160b5ad7
commit b842d467f1
10 changed files with 1305 additions and 1131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/zhgd/jeecg/common/system/query/QueryGenerator.java
View File

@ -75,9 +75,22 @@ public class QueryGenerator {
* @return
*/
public static <T> QueryWrapper<T> initQueryWrapper(T searchObj, Map<String, String[]> parameterMap, List<String> excludeFields) {
return initQueryWrapper(searchObj, parameterMap, excludeFields, null);
}
/**
* 获取查询条件构造器QueryWrapper实例 通用查询条件已被封装完成
*
* @param searchObj
* @param parameterMap
* @param excludeFields 排除属性（eg：ReflectionUtil.getFieldNameList)
* @param likeFields like属性
* @return
*/
public static <T> QueryWrapper<T> initQueryWrapper(T searchObj, Map<String, String[]> parameterMap, List<String> excludeFields, List<String> likeFields) {
long start = System.currentTimeMillis();
QueryWrapper<T> queryWrapper = new QueryWrapper<T>();
installMplus(queryWrapper, searchObj, parameterMap, excludeFields);
installMplus(queryWrapper, searchObj, parameterMap, excludeFields, likeFields);
log.info("---查询条件构造器初始化完成,耗时:" + (System.currentTimeMillis() - start) + "毫秒----");
return queryWrapper;
}
@ -91,6 +104,10 @@ public class QueryGenerator {
* @param excludeFields 排除属性
*/
public static void installMplus(QueryWrapper<?> queryWrapper, Object searchObj, Map<String, String[]> parameterMap, List<String> excludeFields) {
installMplus(queryWrapper, searchObj, parameterMap, excludeFields, null);
}
public static void installMplus(QueryWrapper<?> queryWrapper, Object searchObj, Map<String, String[]> parameterMap, List<String> excludeFields, List<String> likeFields) {
/*
* 注意:权限查询由前端配置数据规则 当一个人有多个所属部门时候 可以在规则配置包含条件 orgCode 包含 #{sys_org_code}
@ -112,6 +129,13 @@ public class QueryGenerator {
continue;
}
//模糊查询
if (likeFields != null && likeFields.contains(name)) {
Object v = PropertyUtils.getSimpleProperty(searchObj, name);
queryWrapper.like(v != null, name, v);
continue;
}
// 添加 判断是否有区间值
String endValue = null, beginValue = null;
if (parameterMap != null && parameterMap.containsKey(name + BEGIN)) {

53
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java
View File

@ -1,41 +1,40 @@
package com.zhgd.xmgl.modules.gt.controller;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialContract;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialContract;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialContractService;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@ -55,6 +54,7 @@ public class GtMaterialContractController {
/**
* 分页列表查询
*
* @param gtMaterialContract
* @param pageNo
* @param pageSize
@ -68,7 +68,10 @@ public class GtMaterialContractController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialContract>> result = new Result<IPage<GtMaterialContract>>();
QueryWrapper<GtMaterialContract> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, req.getParameterMap());
QueryWrapper<GtMaterialContract> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialContract, req.getParameterMap()
, ReflectionUtil.getFieldNameList(GtMaterialContract::getContractName));
queryWrapper.lambda()
.like(StringUtils.isNotBlank(gtMaterialContract.getContractName()), GtMaterialContract::getContractName, gtMaterialContract.getContractName());
Page<GtMaterialContract> page = new Page<GtMaterialContract>(pageNo, pageSize);
IPage<GtMaterialContract> pageList = gtMaterialContractService.page(page, queryWrapper);
result.setSuccess(true);
@ -78,6 +81,7 @@ public class GtMaterialContractController {
/**
* 列表查询
*
* @param gtMaterialContract
* @param pageNo 页码
* @param pageSize 条数
@ -95,6 +99,7 @@ public class GtMaterialContractController {
/**
* 添加
*
* @param gtMaterialContract
* @return
*/
@ -115,6 +120,7 @@ public class GtMaterialContractController {
/**
* 编辑
*
* @param gtMaterialContract
* @return
*/
@ -135,6 +141,7 @@ public class GtMaterialContractController {
/**
* 通过id删除
*
* @param id
* @return
*/
@ -159,6 +166,7 @@ public class GtMaterialContractController {
/**
* 批量删除
*
* @param ids
* @return
*/
@ -178,6 +186,7 @@ public class GtMaterialContractController {
/**
* 通过id查询
*
* @param id
* @return
*/

4
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.gt.controller;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialDevice;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@ -68,7 +69,8 @@ public class GtMaterialDeviceController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialDevice>> result = new Result<IPage<GtMaterialDevice>>();
QueryWrapper<GtMaterialDevice> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialDevice, req.getParameterMap());
QueryWrapper<GtMaterialDevice> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialDevice, req.getParameterMap(), null,
ReflectionUtil.getFieldNameList(GtMaterialDevice::getDeviceName));
Page<GtMaterialDevice> page = new Page<GtMaterialDevice>(pageNo, pageSize);
IPage<GtMaterialDevice> pageList = gtMaterialDeviceService.page(page, queryWrapper);
result.setSuccess(true);

59
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java
View File

@ -1,41 +1,40 @@
package com.zhgd.xmgl.modules.gt.controller;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialInOutWarehouse;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialInOutWarehouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialInOutWarehouse;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialInOutWarehouseService;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@ -55,6 +54,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 分页列表查询
*
* @param gtMaterialInOutWarehouse
* @param pageNo
* @param pageSize
@ -68,7 +68,14 @@ public class GtMaterialInOutWarehouseController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialInOutWarehouse>> result = new Result<IPage<GtMaterialInOutWarehouse>>();
QueryWrapper<GtMaterialInOutWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, req.getParameterMap());
QueryWrapper<GtMaterialInOutWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialInOutWarehouse, req.getParameterMap()
, null, ReflectionUtil.getFieldNameList(GtMaterialInOutWarehouse::getNumber, GtMaterialInOutWarehouse::getCategory, GtMaterialInOutWarehouse::getVendor,
GtMaterialInOutWarehouse::getLotNumber, GtMaterialInOutWarehouse::getWarehouse, GtMaterialInOutWarehouse::getDepartment, GtMaterialInOutWarehouse::getHandler
, GtMaterialInOutWarehouse::getCustomer));
queryWrapper.lambda()
.ge(gtMaterialInOutWarehouse.getCreateTime() != null, GtMaterialInOutWarehouse::getUpdateTime, gtMaterialInOutWarehouse.getCreateTime())
.le(gtMaterialInOutWarehouse.getEndTime() != null, GtMaterialInOutWarehouse::getUpdateTime, gtMaterialInOutWarehouse.getEndTime())
.orderByDesc(GtMaterialInOutWarehouse::getId);
Page<GtMaterialInOutWarehouse> page = new Page<GtMaterialInOutWarehouse>(pageNo, pageSize);
IPage<GtMaterialInOutWarehouse> pageList = gtMaterialInOutWarehouseService.page(page, queryWrapper);
result.setSuccess(true);
@ -78,6 +85,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 列表查询
*
* @param gtMaterialInOutWarehouse
* @param pageNo 页码
* @param pageSize 条数
@ -95,6 +103,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 添加
*
* @param gtMaterialInOutWarehouse
* @return
*/
@ -115,6 +124,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 编辑
*
* @param gtMaterialInOutWarehouse
* @return
*/
@ -135,6 +145,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 通过id删除
*
* @param id
* @return
*/
@ -159,6 +170,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 批量删除
*
* @param ids
* @return
*/
@ -178,6 +190,7 @@ public class GtMaterialInOutWarehouseController {
/**
* 通过id查询
*
* @param id
* @return
*/

57
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java
View File

@ -1,41 +1,40 @@
package com.zhgd.xmgl.modules.gt.controller;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialPurchaseDemandPlanning;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialPurchaseDemandPlanningService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialPurchaseDemandPlanning;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialPurchaseDemandPlanningService;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@ -55,6 +54,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 分页列表查询
*
* @param gtMaterialPurchaseDemandPlanning
* @param pageNo
* @param pageSize
@ -68,7 +68,12 @@ public class GtMaterialPurchaseDemandPlanningController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialPurchaseDemandPlanning>> result = new Result<IPage<GtMaterialPurchaseDemandPlanning>>();
QueryWrapper<GtMaterialPurchaseDemandPlanning> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, req.getParameterMap());
QueryWrapper<GtMaterialPurchaseDemandPlanning> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialPurchaseDemandPlanning, req.getParameterMap()
, ReflectionUtil.getFieldNameList(GtMaterialPurchaseDemandPlanning::getMaterialName, GtMaterialPurchaseDemandPlanning::getSpecificationAndModel));
queryWrapper.lambda()
.like(StringUtils.isNotBlank(gtMaterialPurchaseDemandPlanning.getMaterialName()), GtMaterialPurchaseDemandPlanning::getMaterialName, gtMaterialPurchaseDemandPlanning.getMaterialName())
.like(StringUtils.isNotBlank(gtMaterialPurchaseDemandPlanning.getSpecificationAndModel()), GtMaterialPurchaseDemandPlanning::getSpecificationAndModel, gtMaterialPurchaseDemandPlanning.getSpecificationAndModel());
Page<GtMaterialPurchaseDemandPlanning> page = new Page<GtMaterialPurchaseDemandPlanning>(pageNo, pageSize);
IPage<GtMaterialPurchaseDemandPlanning> pageList = gtMaterialPurchaseDemandPlanningService.page(page, queryWrapper);
result.setSuccess(true);
@ -78,6 +83,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 列表查询
*
* @param gtMaterialPurchaseDemandPlanning
* @param pageNo 页码
* @param pageSize 条数
@ -95,6 +101,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 添加
*
* @param gtMaterialPurchaseDemandPlanning
* @return
*/
@ -115,6 +122,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 编辑
*
* @param gtMaterialPurchaseDemandPlanning
* @return
*/
@ -135,6 +143,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 通过id删除
*
* @param id
* @return
*/
@ -159,6 +168,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 批量删除
*
* @param ids
* @return
*/
@ -178,6 +188,7 @@ public class GtMaterialPurchaseDemandPlanningController {
/**
* 通过id查询
*
* @param id
* @return
*/

7
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.gt.controller;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialSupplierEvaluationRecordService;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@ -23,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -68,7 +70,10 @@ public class GtMaterialSupplierEvaluationRecordController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialSupplierEvaluationRecord>> result = new Result<IPage<GtMaterialSupplierEvaluationRecord>>();
QueryWrapper<GtMaterialSupplierEvaluationRecord> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSupplierEvaluationRecord, req.getParameterMap());
QueryWrapper<GtMaterialSupplierEvaluationRecord> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialSupplierEvaluationRecord, req.getParameterMap()
, ReflectionUtil.getFieldNameList(GtMaterialSupplierEvaluationRecord::getVendorName));
queryWrapper.lambda()
.like(StringUtils.isNotBlank(gtMaterialSupplierEvaluationRecord.getVendorName()), GtMaterialSupplierEvaluationRecord::getVendorName, gtMaterialSupplierEvaluationRecord.getVendorName());
Page<GtMaterialSupplierEvaluationRecord> page = new Page<GtMaterialSupplierEvaluationRecord>(pageNo, pageSize);
IPage<GtMaterialSupplierEvaluationRecord> pageList = gtMaterialSupplierEvaluationRecordService.page(page, queryWrapper);
result.setSuccess(true);

51
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java
View File

@ -1,41 +1,40 @@
package com.zhgd.xmgl.modules.gt.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialTender;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialTenderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@ -55,6 +54,7 @@ public class GtMaterialTenderController {
/**
* 分页列表查询
*
* @param gtMaterialTender
* @param pageNo
* @param pageSize
@ -68,7 +68,10 @@ public class GtMaterialTenderController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialTender>> result = new Result<IPage<GtMaterialTender>>();
QueryWrapper<GtMaterialTender> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, req.getParameterMap());
QueryWrapper<GtMaterialTender> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialTender, req.getParameterMap()
, ReflectionUtil.getFieldNameList(GtMaterialTender::getTenderName));
queryWrapper.lambda()
.like(StringUtils.isNotBlank(gtMaterialTender.getTenderName()), GtMaterialTender::getTenderName, gtMaterialTender.getTenderName());
Page<GtMaterialTender> page = new Page<GtMaterialTender>(pageNo, pageSize);
IPage<GtMaterialTender> pageList = gtMaterialTenderService.page(page, queryWrapper);
result.setSuccess(true);
@ -78,6 +81,7 @@ public class GtMaterialTenderController {
/**
* 列表查询
*
* @param gtMaterialTender
* @param pageNo 页码
* @param pageSize 条数
@ -95,6 +99,7 @@ public class GtMaterialTenderController {
/**
* 添加
*
* @param gtMaterialTender
* @return
*/
@ -115,6 +120,7 @@ public class GtMaterialTenderController {
/**
* 编辑
*
* @param gtMaterialTender
* @return
*/
@ -135,6 +141,7 @@ public class GtMaterialTenderController {
/**
* 通过id删除
*
* @param id
* @return
*/
@ -159,6 +166,7 @@ public class GtMaterialTenderController {
/**
* 批量删除
*
* @param ids
* @return
*/
@ -178,6 +186,7 @@ public class GtMaterialTenderController {
/**
* 通过id查询
*
* @param id
* @return
*/

58
src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java
View File

@ -1,41 +1,40 @@
package com.zhgd.xmgl.modules.gt.controller;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialVendorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.oConvertUtils;
import com.zhgd.xmgl.modules.gt.entity.GtMaterialVendor;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.gt.service.IGtMaterialVendorService;
import com.zhgd.xmgl.util.ReflectionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@ -55,6 +54,7 @@ public class GtMaterialVendorController {
/**
* 分页列表查询
*
* @param gtMaterialVendor
* @param pageNo
* @param pageSize
@ -68,7 +68,15 @@ public class GtMaterialVendorController {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<GtMaterialVendor>> result = new Result<IPage<GtMaterialVendor>>();
QueryWrapper<GtMaterialVendor> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, req.getParameterMap());
QueryWrapper<GtMaterialVendor> queryWrapper = QueryGenerator.initQueryWrapper(gtMaterialVendor, req.getParameterMap()
, ReflectionUtil.getFieldNameList(GtMaterialVendor::getLookupCode, GtMaterialVendor::getVendorName, GtMaterialVendor::getTaxpayerIdentificationNumber,
GtMaterialVendor::getContact, GtMaterialVendor::getContactNumber));
queryWrapper.lambda()
.like(StringUtils.isNotBlank(gtMaterialVendor.getLookupCode()), GtMaterialVendor::getLookupCode, gtMaterialVendor.getLookupCode())
.like(StringUtils.isNotBlank(gtMaterialVendor.getVendorName()), GtMaterialVendor::getVendorName, gtMaterialVendor.getVendorName())
.like(StringUtils.isNotBlank(gtMaterialVendor.getTaxpayerIdentificationNumber()), GtMaterialVendor::getTaxpayerIdentificationNumber, gtMaterialVendor.getTaxpayerIdentificationNumber())
.like(StringUtils.isNotBlank(gtMaterialVendor.getContact()), GtMaterialVendor::getContact, gtMaterialVendor.getContact())
.like(StringUtils.isNotBlank(gtMaterialVendor.getContactNumber()), GtMaterialVendor::getContactNumber, gtMaterialVendor.getContactNumber());
Page<GtMaterialVendor> page = new Page<GtMaterialVendor>(pageNo, pageSize);
IPage<GtMaterialVendor> pageList = gtMaterialVendorService.page(page, queryWrapper);
result.setSuccess(true);
@ -78,6 +86,7 @@ public class GtMaterialVendorController {
/**
* 列表查询
*
* @param gtMaterialVendor
* @param pageNo 页码
* @param pageSize 条数
@ -95,6 +104,7 @@ public class GtMaterialVendorController {
/**
* 添加
*
* @param gtMaterialVendor
* @return
*/
@ -115,6 +125,7 @@ public class GtMaterialVendorController {
/**
* 编辑
*
* @param gtMaterialVendor
* @return
*/
@ -135,6 +146,7 @@ public class GtMaterialVendorController {
/**
* 通过id删除
*
* @param id
* @return
*/
@ -159,6 +171,7 @@ public class GtMaterialVendorController {
/**
* 批量删除
*
* @param ids
* @return
*/
@ -178,6 +191,7 @@ public class GtMaterialVendorController {
/**
* 通过id查询
*
* @param id
* @return
*/

15
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java
View File

@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.gt.entity;
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;
@ -95,10 +96,22 @@ public class GtMaterialInOutWarehouse implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间（制单时间）")
private java.util.Date createTime;
/**更新时间*/
/**
* 更新时间
*/
@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 updateTime;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}

74
src/main/resources/application-zjwj-gsx.properties Normal file
View File

@ -0,0 +1,74 @@
#http.port=30250
http.port=65000
#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC
#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite_zjwj?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
server.port=30000
#server.port=30246
basePath=C:/jxj/prod/backEnd/itbgpImage/
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/
#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll
#basePath=F:/zhgd/itbgpImage/
#server.tomcat.basedir=F:/zhgd/tempImage/
#arcsoft.dllPath=F:/zhgd/dll
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
security.enable=false
isGetStandardData=false
isGetEnvironmentData=false
isGetFaceFeatureDate=false
#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362
video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url
video-analysis-url=
server.ssl.enabled=false
#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A
defaultZwComapnySn=
#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E
#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0
spring.file-storage.default-platform=local
#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011
spring.file-storage.thumbnail-suffix=.jpg
# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199
# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6
spring.file-storage.local[0].platform=local
#\u542F\u7528\u5B58\u50A8
spring.file-storage.local[0].enable-storage=true
#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09
spring.file-storage.local[0].enable-access=false
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D
spring.file-storage.local[0].domain=
# \u5B58\u50A8\u5730\u5740
spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/
# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6
spring.file-storage.local[0].path-patterns=
spring.file-storage.aliyun-oss[0].platform=aliyun-oss
spring.file-storage.aliyun-oss[0].enable-storage=false
spring.file-storage.aliyun-oss[0].access-key=
spring.file-storage.aliyun-oss[0].secret-key=
spring.file-storage.aliyun-oss[0].end-point=
spring.file-storage.aliyun-oss[0].bucket-name=
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
spring.file-storage.aliyun-oss[0].domain=
spring.file-storage.aliyun-oss[0].base-path=
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
spring.boot.admin.client.instance.service-url=http://localhost:18070
spring.boot.admin.client.instance.name=zjsj
# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740
double-carbon.water-data-url=http://test.cesms.net
double-carbon.ammeter-data-url=http://test.cesms.net
license.licensePath=C:/jxj/prod/backEnd/license/license.lic
license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore
#\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7
high_formwork.netty.port=15333