diff --git a/src/main/java/com/cetc32/dh/beans/ReqSubmit.java b/src/main/java/com/cetc32/dh/beans/ReqSubmit.java index f31503e85f06fa2521acc0fe617220dac5e10685..f6b4dbf86f70ec4c8f63c84337fb46f09b08d9af 100644 --- a/src/main/java/com/cetc32/dh/beans/ReqSubmit.java +++ b/src/main/java/com/cetc32/dh/beans/ReqSubmit.java @@ -16,6 +16,7 @@ public class ReqSubmit { private String file; private String demandClassify; + public String getProject() { return project; } diff --git a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java index 1f1e0b053df13d187c2afb9fefd2da7634d9f670..31fe03a55e27eafa72d44ae70f3aa820e07b91b8 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -26,12 +26,13 @@ import java.io.*; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; /** * 需求管理类 @@ -50,155 +51,158 @@ public class DemanSubmitController { String myPath; /** - *展示所有需求 + * 展示所有需求 + * * @return PageDateResult */ @ApiOperation(value = "展示所有需求") @ApiImplicitParams({ - @ApiImplicitParam(name="classify", value="需求分类",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="searchname",value="需求名称",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="people",value="上报人",dataType = "String",defaultValue = ""), + @ApiImplicitParam(name = "classify", value = "需求分类", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "searchname", value = "需求名称", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "people", value = "上报人", dataType = "String", defaultValue = ""), @ApiImplicitParam(name = "starttime", value = "开始时间", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name ="endtime",value = "结束时间", dataType = "String", defaultValue = ""), - @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), - @ApiImplicitParam(name="result",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - @ApiImplicitParam(name="status",value = "状态",dataType = "String",defaultValue = ""), + @ApiImplicitParam(name = "endtime", value = "结束时间", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "page", value = "页码", dataType = "Integer", defaultValue = "0"), + @ApiImplicitParam(name = "result", value = "每页数据条数", dataType = "Integer", defaultValue = "10"), + @ApiImplicitParam(name = "status", value = "状态", dataType = "String", defaultValue = ""), }) @PostMapping("/options") - public PageDataResult demandsubmitAll(@RequestBody vDemand vdemand, @RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results){ - if(StringUtils.isBlank(vdemand.classify)&&StringUtils.isBlank(vdemand.name)&&StringUtils.isBlank(vdemand.people) - &&StringUtils.isBlank(vdemand.starttime)&&StringUtils.isBlank(vdemand.endtime)&&StringUtils.isBlank(vdemand.status) - && StringUtils.isBlank(vdemand.getTd_end() )&& StringUtils.isBlank(vdemand.getTd_start())){ - - List demandlist = new ArrayList<>(); - Long count = 0L; - demandlist = demandSubmitService.queryFilesByObj(vdemand); - count = demandSubmitService.countFilesByObj(vdemand); - return new PageDataResult(count,demandlist,vdemand.getOffset()); - }else if(StringUtils.isNotBlank(vdemand.name)&&(vdemand.name.contains("%"))){ - List demandlist = new ArrayList<>(); - return new PageDataResult(0,demandlist,0); - } - else{ - String frontfirst = vdemand.getStarttime(); - String endTime = vdemand.getEndtime(); - Date firstdate =null,secondDate = null; - DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - DateFormat yMdHmsm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - if(StringUtils.isNotBlank(vdemand.getName())) - vdemand.setName("%"+vdemand.getName()+"%"); - if(vdemand.getStarttime()!=null&&vdemand.getEndtime()!=null){ - try{ - firstdate = format1.parse(frontfirst); - secondDate = format1.parse(endTime); - vdemand.setSqlstarttime(firstdate); - vdemand.setSqlendtime(secondDate); - }catch (ParseException e) { - e.printStackTrace(); - } - } - if(StringUtils.isNotBlank(vdemand.getTd_end())){ - try { - Date d = format1.parse(vdemand.getTd_end()); - vdemand.setTd_end( yMdHmsm.format(DateUtils.ceilDay(d))); - } catch (ParseException e) { - e.printStackTrace(); - } - } - if(StringUtils.isNotBlank(vdemand.getTd_start())){ - try { - Date d = format1.parse(vdemand.getTd_start()); - vdemand.setTd_start( yMdHmsm.format(DateUtils.floorDay(d))); - } catch (ParseException e) { - e.printStackTrace(); - } - } - List demandlist = new ArrayList<>(); - Long count = 0L; + public PageDataResult demandsubmitAll(@RequestBody vDemand vdemand, @RequestParam(defaultValue = "0", required = false) Integer page, @RequestParam(defaultValue = "10", required = false) Integer results) { + if (StringUtils.isBlank(vdemand.classify) && StringUtils.isBlank(vdemand.name) && StringUtils.isBlank(vdemand.people) + && StringUtils.isBlank(vdemand.starttime) && StringUtils.isBlank(vdemand.endtime) && StringUtils.isBlank(vdemand.status) + && StringUtils.isBlank(vdemand.getTd_end()) && StringUtils.isBlank(vdemand.getTd_start())) { + + List demandlist = new ArrayList<>(); + Long count = 0L; + demandlist = demandSubmitService.queryFilesByObj(vdemand); + count = demandSubmitService.countFilesByObj(vdemand); + return new PageDataResult(count, demandlist, vdemand.getOffset()); + } else if (StringUtils.isNotBlank(vdemand.name) && (vdemand.name.contains("%"))) { + List demandlist = new ArrayList<>(); + return new PageDataResult(0, demandlist, 0); + } else { + String frontfirst = vdemand.getStarttime(); + String endTime = vdemand.getEndtime(); + Date firstdate = null, secondDate = null; + DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); + DateFormat yMdHmsm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + if (StringUtils.isNotBlank(vdemand.getName())) + vdemand.setName("%" + vdemand.getName() + "%"); + if (vdemand.getStarttime() != null && vdemand.getEndtime() != null) { + try { + firstdate = format1.parse(frontfirst); + secondDate = format1.parse(endTime); + vdemand.setSqlstarttime(firstdate); + vdemand.setSqlendtime(secondDate); + } catch (ParseException e) { + e.printStackTrace(); + } + } + if (StringUtils.isNotBlank(vdemand.getTd_end())) { + try { + Date d = format1.parse(vdemand.getTd_end()); + vdemand.setTd_end(yMdHmsm.format(DateUtils.ceilDay(d))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + if (StringUtils.isNotBlank(vdemand.getTd_start())) { + try { + Date d = format1.parse(vdemand.getTd_start()); + vdemand.setTd_start(yMdHmsm.format(DateUtils.floorDay(d))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + List demandlist = new ArrayList<>(); + Long count = 0L; /*if((vdemand.getName()!=null&&vdemand.getName().contains("%"))||(vdemand.getPeople()!=null&&vdemand.getPeople().contains("%"))){ return new PageDataResult(count,demandlist,vdemand.getOffset()); }*/ - demandlist = demandSubmitService.queryFilesByObj(vdemand); - count = demandSubmitService.countFilesByObj(vdemand); - return new PageDataResult(count,demandlist,vdemand.getOffset()); - } + demandlist = demandSubmitService.queryFilesByObj(vdemand); + count = demandSubmitService.countFilesByObj(vdemand); + return new PageDataResult(count, demandlist, vdemand.getOffset()); + } } /** * 新增需求 + * * @param demandDTO * @return ResponseResult */ - @ApiOperation(value="新增需求") + @ApiOperation(value = "新增需求") @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="projectName",value = "项目名称",paramType = "body",dataType = "String" ,defaultValue = ""), - @ApiImplicitParam(name="demandName",value = "需求名称",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandDes",value = "需求描述",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="reporter",value = "报告人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="departmentid",value = "部门索引",paramType = "body",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="approver",value="人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getApproveFront",value = "前端传来的时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getEndtimeFront",value = "前端传来的结束时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandClassify",value = "需求分类",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandAttachment",value = "附件",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="areachoice",value = "范围选择",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="userid",value = "当前操作的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), + @ApiImplicitParam(name = "id", value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false), + @ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandName", value = "需求名称", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandDes", value = "需求描述", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "status", value = "状态", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "reporter", value = "报告人", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "departmentid", value = "部门索引", paramType = "body", dataType = "Integer", defaultValue = ""), + @ApiImplicitParam(name = "approver", value = "人", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "getApproveFront", value = "前端传来的时间", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "getEndtimeFront", value = "前端传来的结束时间", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandClassify", value = "需求分类", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandAttachment", value = "附件", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "areachoice", value = "范围选择", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "userid", value = "当前操作的用户id", paramType = "body", dataType = "Integer", defaultValue = ""), }) @PostMapping("/insertselect") public ResponseResult insertselect(@RequestBody DemandDTO demandDTO) { DemandSubmit demandSubmit = new DemandSubmit(); - BeanUtils.copyProperties(demandDTO,demandSubmit); - Integer userid = SecurityUserUtil.getUser().getId(); - if(demandSubmit.getDemandName()==null||demandSubmit.getDemandClassify()==null - ||demandSubmit.getGetEndtimeFront()==null){ + BeanUtils.copyProperties(demandDTO, demandSubmit); + Integer userid = SecurityUserUtil.getUser().getId(); + if (demandSubmit.getDemandName() == null || demandSubmit.getDemandClassify() == null + || demandSubmit.getGetEndtimeFront() == null) { return ResponseResult.error("传入空值!"); } String entime = demandSubmit.getGetEndtimeFront(); DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new Date(); - try{ + Date date = new Date(); + try { date = format1.parse(entime); - }catch (ParseException e) { + } catch (ParseException e) { e.printStackTrace(); } demandSubmit.setEndtime(date); - String upCachePath=myPath+"_user"+userid; + String upCachePath = myPath + "_user" + userid; //BaseAdminUser adminUser=getCurrentUserId(); - String userName =SecurityUserUtil.getUser().getUsername(); + String userName = SecurityUserUtil.getUser().getUsername(); demandSubmit.setReporter(userName); - String status="未审批"; - Date d= new Date(); + String status = "未审批"; + Date d = new Date(); String timestamp = String.valueOf(d.getTime()); - String path = myPath+"admin"+timestamp; + String path = myPath + "admin" + timestamp; demandSubmit.setStatus(status); Date create = new Date(); demandSubmit.setCreattime(create); - if(FileUtil.copyFolder(upCachePath, path)){ + if (FileUtil.copyFolder(upCachePath, path)) { FileUtil.deleteDir(upCachePath); - }else { + } else { return ResponseResult.error("upload fail"); } demandSubmit.setDemandAttachment(path); - if(demandSubmitService.insertSelective(demandSubmit)>0){ - return new ResponseResult("创建成功!"); - }; + if (demandSubmitService.insertSelective(demandSubmit) > 0) { + return new ResponseResult("创建成功!"); + } + ; return ResponseResult.error("wrong"); } /** - *选择指定偏移量的需求 + * 选择指定偏移量的需求 + * * @param pagesize * @param pagenum * @return PageDataResult */ @ApiOperation(value = "选择指定偏移量的需求") @PostMapping("/selectbylimit") - public PageDataResult selectbylimit(@ApiParam(value = "页码") Integer pagesize, @ApiParam(value = "每页数据条数") Integer pagenum){ + public PageDataResult selectbylimit(@ApiParam(value = "页码") Integer pagesize, @ApiParam(value = "每页数据条数") Integer pagenum) { PageDataResult pdr = new PageDataResult(); - if(pagenum == null || pagenum == 0){ - pagenum =1; + if (pagenum == null || pagenum == 0) { + pagenum = 1; } if (pagesize == null || pagesize == 0) pagesize = 10; @@ -209,14 +213,15 @@ public class DemanSubmitController { /** * 选择指定索引的需求 + * * @param id * @return ResponseResult */ @ApiOperation(value = "选择指定索引的需求") - @ApiImplicitParam(name="id",value = "索引",dataType = "Integer",defaultValue = "") + @ApiImplicitParam(name = "id", value = "索引", dataType = "Integer", defaultValue = "") @PostMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id){ - if(id == null){ + public ResponseResult selsectbykey(Integer id) { + if (id == null) { return ResponseResult.error("id为空!"); } ResponseResult pdr = new ResponseResult(); @@ -226,14 +231,15 @@ public class DemanSubmitController { /** * 删除指定的需求 + * * @param id * @return ResponseResult */ @ApiOperation(value = "删除指定索引的需求") - @ApiImplicitParam(name="id",value = "索引",dataType = "Integer",defaultValue = "") + @ApiImplicitParam(name = "id", value = "索引", dataType = "Integer", defaultValue = "") @PostMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ - if(id == null) + public ResponseResult deletebyprimarykey(Integer id) { + if (id == null) return ResponseResult.error("传入值为空!"); demandSubmitService.deleteByPrimaryKey(id); return new ResponseResult("Success"); @@ -241,39 +247,40 @@ public class DemanSubmitController { /** * 更新指定的需求 + * * @param demandSubmit * @return ResponseResult */ - @ApiOperation(value="更新需求") + @ApiOperation(value = "更新需求") @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="projectName",value = "项目名称",paramType = "body",dataType = "String" ,defaultValue = ""), - @ApiImplicitParam(name="demandName",value = "需求名称",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandDes",value = "需求描述",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="reporter",value = "报告人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="departmentid",value = "部门索引",paramType = "body",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="approver",value="人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getApproveFront",value = "前端传来的时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="getEndtimeFront",value = "前端传来的结束时间",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandClassify",value = "需求分类",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandAttachment",value = "附件",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="areachoice",value = "范围选择",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="creattime",value = "创建时间",paramType = "body",dataType = "Timestamp",defaultValue = ""), - @ApiImplicitParam(name="useid",value = "对应的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), + @ApiImplicitParam(name = "id", value = "记录id号", paramType = "body", dataType = "Integer", required = false), + @ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandName", value = "需求名称", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandDes", value = "需求描述", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "status", value = "状态", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "reporter", value = "报告人", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "departmentid", value = "部门索引", paramType = "body", dataType = "Integer", defaultValue = ""), + @ApiImplicitParam(name = "approver", value = "人", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "getApproveFront", value = "前端传来的时间", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "getEndtimeFront", value = "前端传来的结束时间", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandClassify", value = "需求分类", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandAttachment", value = "附件", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "areachoice", value = "范围选择", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "creattime", value = "创建时间", paramType = "body", dataType = "Timestamp", defaultValue = ""), + @ApiImplicitParam(name = "useid", value = "对应的用户id", paramType = "body", dataType = "Integer", defaultValue = ""), }) @PostMapping("/updateselect") public ResponseResult updateselect(@RequestBody DemandSubmit demandSubmit) { - if(demandSubmit == null){ + if (demandSubmit == null) { return ResponseResult.error("传入值为空!"); } String entime = demandSubmit.getGetEndtimeFront(); - if(StringUtils.isNotBlank(entime)){ + if (StringUtils.isNotBlank(entime)) { DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd"); Date date = new Date(); - try{ + try { date = format1.parse(entime); - }catch (ParseException e) { + } catch (ParseException e) { e.printStackTrace(); } demandSubmit.setEndtime(date); @@ -284,14 +291,15 @@ public class DemanSubmitController { /** * 模糊查询 + * * @param pageNum * @param pageSize * @param keyword * @return PageDataResult */ - @ApiOperation(value="查询接口") + @ApiOperation(value = "查询接口") @PostMapping("/search") - @ApiImplicitParam(name="keyword",value = "关键词",dataType = "String",defaultValue = "") + @ApiImplicitParam(name = "keyword", value = "关键词", dataType = "String", defaultValue = "") public PageDataResult demandSubmitSearch(@ApiParam(value = "页码") Integer pageNum, @ApiParam(value = "每页数据条数") Integer pageSize, String keyword) { PageDataResult pdr = new PageDataResult(); @@ -301,11 +309,11 @@ public class DemanSubmitController { if (pageSize == null || pageSize == 0) pageSize = 10; - if(keyword.equals("all")){ + if (keyword.equals("all")) { pdr.setTotals(demandSubmitService.countDemand()); PageHelper.startPage(pageNum, pageSize); pdr.setList(demandSubmitService.findAll()); - }else { + } else { pdr.setTotals(demandSubmitService.findByKeyWord(keyword).size()); PageHelper.startPage(pageNum, pageSize); pdr.setList(demandSubmitService.findByKeyWord(keyword)); @@ -316,18 +324,19 @@ public class DemanSubmitController { /** * 目录/文件上传 + * * @param file 目录,文件 * @return 返回提交结果 - * */ + */ @ApiOperation(value = "文件上传") @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) @ApiImplicitParams({ @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""), @ApiImplicitParam(name = "userid", value = "用户id", paramType = "body", dataType = "Integer"), }) - public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file) { + public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file) { // String filepath = "/root/upLoad"; - String upCachePath=myPath+"_user"+ SecurityUserUtil.getUser().getId(); + String upCachePath = myPath + "_user" + SecurityUserUtil.getUser().getId(); String filepath = upCachePath; String result = FileUtil.uploadFile(file, filepath); if (!result.contains("上传失败")) @@ -339,13 +348,14 @@ public class DemanSubmitController { /** * 文件上传缓冲区清空 + * * @return 返回文件清空结果 - * */ + */ @ApiOperation(value = "清空历史上传") @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST) @ApiImplicitParam(name = "userId", value = "当前用户id") public ResponseResult clearUploadFile() { - String upCachePath=myPath+"_user"+ SecurityUserUtil.getUser().getId(); + String upCachePath = myPath + "_user" + SecurityUserUtil.getUser().getId(); FileUtil.deleteDir(upCachePath); File file = new File(upCachePath); if (!file.exists()) { @@ -356,10 +366,11 @@ public class DemanSubmitController { /** * 获取当前用户下的所有需求 + * * @return PageDataResult */ @PostMapping("/getdemand") - public PageDataResult getUserAll(){ + public PageDataResult getUserAll() { //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); String name = SecurityUserUtil.getUser().getUsername(); PageDataResult pdr = new PageDataResult(); @@ -370,12 +381,13 @@ public class DemanSubmitController { /** * 单个需求通过 + * * @param id * @param status * @return */ @PostMapping("/acceptdemand") - public ResponseResult acceptDemand(Integer id,String status){ + public ResponseResult acceptDemand(Integer id, String status) { DemandSubmit demandSubmit = demandSubmitService.selectByPrimaryKey(id); demandSubmit.setStatus(status); demandSubmitService.updateByPrimaryKeySelective(demandSubmit); @@ -385,12 +397,13 @@ public class DemanSubmitController { /** * 单个需求拒绝 + * * @param id * @param status * @return */ @PostMapping("/rejectdemand") - public ResponseResult rejectDemand(Integer id,String status){ + public ResponseResult rejectDemand(Integer id, String status) { DemandSubmit demandSubmit = demandSubmitService.selectByPrimaryKey(id); demandSubmit.setStatus(status); demandSubmitService.updateByPrimaryKeySelective(demandSubmit); @@ -400,8 +413,9 @@ public class DemanSubmitController { /** * 多个需求通过 + * * @return 返回执行结果 - * **/ + **/ @ApiOperation(value = "批量审批通过") @PostMapping("/accept") @ApiImplicitParams({ @@ -412,9 +426,9 @@ public class DemanSubmitController { List ids = new ArrayList<>(); ids = (List) map.get("ids"); DemandSubmit demandSubmit = new DemandSubmit(); - String reason=(String) map.get("reason"); + String reason = (String) map.get("reason"); String staus = "审批通过"; - String userName = SecurityUserUtil.getUser().getUsername(); + String userName = SecurityUserUtil.getUser().getUsername(); int sum = 0; for (int i = 0; i < ids.size(); i++) { Integer id = ids.get(i); @@ -435,8 +449,9 @@ public class DemanSubmitController { /** * 多个需求通过拒绝 + * * @return 返回执行结果 - * **/ + **/ @ApiOperation(value = "批量审批拒绝") @PostMapping("/refuse") @ApiImplicitParams({ @@ -447,7 +462,7 @@ public class DemanSubmitController { List ids = new ArrayList<>(); ids = (List) map.get("ids"); DemandSubmit demandSubmit = new DemandSubmit(); - String reason=(String) map.get("reason"); + String reason = (String) map.get("reason"); String userName = SecurityUserUtil.getUser().getUsername(); String staus = "审批拒绝"; int sum = 0; @@ -469,17 +484,16 @@ public class DemanSubmitController { } - - /** * 下载功能 - * @return 下载后的文件名 - * **/ + * + * @return 下载后的文件名 + **/ @ApiOperation(value = "下载") @GetMapping("/download") @ApiImplicitParam(name = "id", value = "需求的记录id", dataType = "Integer", defaultValue = "") - public String download(Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception{ - DemandSubmit demandSubmit= demandSubmitService.selectByPrimaryKey(id); + public String download(Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception { + DemandSubmit demandSubmit = demandSubmitService.selectByPrimaryKey(id); String path = demandSubmit.getDemandAttachment(); // path是指欲下载的文件的路径。 @@ -487,9 +501,9 @@ public class DemanSubmitController { // String filename = file.getName(); // // 取得文件的后缀名。 // String ext = filename.substring(filename.lastIndexOf(".") + 1).toUpperCase(); - String zipPath = FileUtil.downloadAllAttachment(path,request,response); - String filename = zipPath.substring(zipPath.lastIndexOf(File.separator)+1,zipPath.length()); - FileUtil.downloadFile(response,filename,zipPath); + String zipPath = FileUtil.downloadAllAttachment(path, request, response); + String filename = zipPath.substring(zipPath.lastIndexOf(File.separator) + 1, zipPath.length()); + FileUtil.downloadFile(response, filename, zipPath); FileUtil.deleteDir(zipPath); return filename; @@ -497,39 +511,69 @@ public class DemanSubmitController { /** * 更新指定的需求 + * * @param demandSubmitDTO * @return ResponseResult */ - @ApiOperation(value="根据状态获取需求id和name") + @ApiOperation(value = "根据状态获取需求id和name") @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "记录id号", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name="demandName",value = "需求名称",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandStatus",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), + @ApiImplicitParam(name = "id", value = "记录id号", paramType = "body", dataType = "Integer", required = false), + @ApiImplicitParam(name = "demandName", value = "需求名称", paramType = "body", dataType = "String", defaultValue = ""), + @ApiImplicitParam(name = "demandStatus", value = "状态", paramType = "body", dataType = "String", defaultValue = ""), }) @PostMapping("/searchbystatus") - public PageDataResult searchStatus(@RequestBody DemandSubmitDTO demandSubmitDTO, @RequestParam(defaultValue = "0",required = false) Integer page, @RequestParam(defaultValue = "10",required = false) Integer results){ - if(demandSubmitDTO.getId()==null&&StringUtils.isBlank(demandSubmitDTO.getDeamndName()) - &&StringUtils.isBlank(demandSubmitDTO.getDemandStatus())){ + public PageDataResult searchStatus(@RequestBody DemandSubmitDTO demandSubmitDTO, @RequestParam(defaultValue = "0", required = false) Integer page, @RequestParam(defaultValue = "10", required = false) Integer results) { + if (demandSubmitDTO.getId() == null && StringUtils.isBlank(demandSubmitDTO.getDeamndName()) + && StringUtils.isBlank(demandSubmitDTO.getDemandStatus())) { demandSubmitDTO.setDemandStatus("1"); List demandSubmitDTOS = demandSubmitService.searchbystatus(demandSubmitDTO); Integer count = demandSubmitService.searchbystatus(demandSubmitDTO).size(); - return new PageDataResult(count,demandSubmitDTOS,page * results); - }else { + return new PageDataResult(count, demandSubmitDTOS, page * results); + } else { List demandSubmitDTOS = demandSubmitService.searchbystatus(demandSubmitDTO); Integer count = demandSubmitService.searchbystatus(demandSubmitDTO).size(); - return new PageDataResult(count,demandSubmitDTOS,page * results); + return new PageDataResult(count, demandSubmitDTOS, page * results); } } @ApiOperation(value = "获取所有的分类") @PostMapping("/getclassify") - public List getAllclassify(){ + public List getAllclassify() { List results = new ArrayList<>(); results.add("全部分类"); List getclassify = demandSubmitService.alldemandclassify(); - for (int i = 0;i getFiveMonth() { + LocalDate startDate = LocalDate.now().withDayOfMonth(1); + List results = new ArrayList<>(); + ArrayList dateTimes = new ArrayList<>(); + for (int i = 1; i < 6; i++) { + LocalDateTime start = LocalDateTime.of(startDate.minusMonths(i), LocalTime.MIDNIGHT); + dateTimes.add(start); + + LocalDateTime end = start.plusMonths(1).minusSeconds(1); + dateTimes.add(end); + } + + DateTimeFormatter dateFormatter3 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + for (LocalDateTime value : dateTimes) { + System.out.println(value.format(dateFormatter3)); + } + for (int i = 0; i < dateTimes.size(); i += 2) { + LocalDateTime Tstart = dateTimes.get(i); + String t_start = Tstart.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + LocalDateTime Tend = dateTimes.get(i + 1); + String t_end = Tend.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + //Pass them off to the query + results.add(demandSubmitService.countByMonth(t_start, t_end)); + } + return results; + } } diff --git a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java index 8d93de83e8aef8c4e9385f2891f16f179afdd530..b667e1c1542ac76ff33d37317dea84052ac55b9d 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java @@ -420,7 +420,7 @@ public class EstimateTaskController { // sb.append((char) ch); // } // fileReader.close(); -// reader.close(); +// reader.close() // jsonStr = sb.toString(); // List listMap = JSONObject.parseArray(jsonStr, HashMap.class); // diff --git a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java index 867834a2fc20ce41d52bad5bc3cc5eb058abf28b..975c6595c0e318aea0ee52fb2131cc5bdca0c062 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.cetc32.dh.beans.DhOflineData; import com.cetc32.dh.beans.ReqSubmit; import com.cetc32.dh.beans.TraceUpload; +import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.*; @@ -28,9 +29,11 @@ import java.lang.reflect.Method; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Base64; -import java.util.Date; -import java.util.Map; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.*; @RestController @RequestMapping("/rest") @@ -76,6 +79,8 @@ public class OtherInterfaceController { submit.setStatus("未审批"); submit.setDemandClassify(req.getDemandClassify()); Date create = new Date(); + submit.setDemandClassify(req.getDemandClassify()); + submit.setStatus("未审批"); submit.setCreattime(create); if(null != files){ String upCachePath = upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis(); @@ -429,4 +434,48 @@ public class OtherInterfaceController { } + @ApiOperation(value = "获取所有的分类") + @PostMapping("/getclassify") + public ResponseResult getAllclassify(){ + return ResponseResult.success( demandSubmitService.alldemandclassify()); + } + + /** + * 获取当前用户下的所有需求 + * @return ResponseResult + */ + @PostMapping("/getdemand") + public ResponseResult getUserAll(@RequestBody Map map){ + String name = (String) map.get("username"); + return ResponseResult.success(demandSubmitService.selectMySubmit(name)); + } + + @ApiOperation(value = "获取近几个月的任务") + @GetMapping("/getbymonth") + public List getFiveMonth(){ + LocalDate startDate = LocalDate.now().withDayOfMonth(1); + List results = new ArrayList<>(); + ArrayList dateTimes = new ArrayList<>(); + for (int i = 1; i < 7; i++) { + LocalDateTime start = LocalDateTime.of(startDate.minusMonths(i), LocalTime.MIDNIGHT); + dateTimes.add(start); + + LocalDateTime end = start.plusMonths(1).minusSeconds(1); + dateTimes.add(end); + } + + DateTimeFormatter dateFormatter3 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + for (LocalDateTime value : dateTimes) { + System.out.println(value.format(dateFormatter3)); + } + for (int i = 0; i < dateTimes.size(); i += 2) { + LocalDateTime Tstart = dateTimes.get(i); + String t_start = Tstart.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + LocalDateTime Tend = dateTimes.get(i + 1); + String t_end = Tend.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + //Pass them off to the query + results.add(productdemandService.countByMonth(t_start,t_end)+ estimateTaskService.countByMonth(t_start,t_end)); + } + return results; + } } diff --git a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java index bdf866a4e617b17ef3556631702d20a12039a9ae..4f5d1fb0d7119914c0c8fbcab0b24a84cf2ca896 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java @@ -8,6 +8,7 @@ import com.cetc32.dh.entity.vDemand; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; import java.util.List; @Repository @@ -68,4 +69,6 @@ public interface DemandSubmitMapper { List searchbystatus(DemandSubmitDTO demandSubmitDTO); List alldemandclassify(); + + Long countByMonth(String t_start,String t_end); } diff --git a/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java b/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java index 0113b164f25e02eafb71fdfbf7948b61bbbce482..81c1562242ecb4a6e9e222f9d390e6cc28938b5a 100644 --- a/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/EstimateTaskMapper.java @@ -66,4 +66,6 @@ public interface EstimateTaskMapper { List allservice(String classify); List alltaskclassify(); + + Long countByMonth(String t_start,String t_end); } \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java b/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java index 3adee90f56ce0f0321f0e5cbb5cb46dbcb3e80a8..543827c7131eae88515ef359778800606df74182 100644 --- a/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/ProductdemandMapper.java @@ -59,4 +59,6 @@ public interface ProductdemandMapper { List selectByStatusAndUser(Productdemand productdemand); List queryFilesByObj(vProduct vproduct); + + Long countByMonth(String t_start,String t_end); } \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/DemandSubmitService.java b/src/main/java/com/cetc32/dh/service/DemandSubmitService.java index 82b3542d4e0591fd58a66c89f200de5f6110b054..e714d335dccac1f6fefb5b05cacb93ae71b1ec33 100644 --- a/src/main/java/com/cetc32/dh/service/DemandSubmitService.java +++ b/src/main/java/com/cetc32/dh/service/DemandSubmitService.java @@ -3,6 +3,7 @@ import com.cetc32.dh.dto.DemandSubmitDTO; import com.cetc32.dh.entity.DemandSubmit; import com.cetc32.dh.entity.vDemand; +import java.time.LocalDateTime; import java.util.List; public interface DemandSubmitService { @@ -66,4 +67,6 @@ public interface DemandSubmitService { List searchbystatus(DemandSubmitDTO demandSubmitDTO); List alldemandclassify(); + + Long countByMonth(String t_start, String t_end); } diff --git a/src/main/java/com/cetc32/dh/service/EstimateTaskService.java b/src/main/java/com/cetc32/dh/service/EstimateTaskService.java index ad218495f943ea102850e66b05df6e493e429ee1..ee057dfbcec78703a71c40a36de8e490dab0f6bd 100644 --- a/src/main/java/com/cetc32/dh/service/EstimateTaskService.java +++ b/src/main/java/com/cetc32/dh/service/EstimateTaskService.java @@ -65,4 +65,6 @@ public interface EstimateTaskService { List allservice(String classify); List alltaskclassify(); + + Long countByMonth(String t_start, String t_end); } diff --git a/src/main/java/com/cetc32/dh/service/ProductdemandService.java b/src/main/java/com/cetc32/dh/service/ProductdemandService.java index af7c8cf71a0664e7c08ccb276c13b795f4e0c903..b139bc8477659489d3e2987586aaeed411e4e6b2 100644 --- a/src/main/java/com/cetc32/dh/service/ProductdemandService.java +++ b/src/main/java/com/cetc32/dh/service/ProductdemandService.java @@ -64,4 +64,6 @@ public interface ProductdemandService { List queryFilesByObj(vProduct vproduct); Map PackageData(List data); + + Long countByMonth(String t_start, String t_end); } diff --git a/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java b/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java index 0bfdfed513b18d42b7db0360c1317dc6c0999a99..094e3188b5137d455e03a294557194bad5aeed3f 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java @@ -8,6 +8,7 @@ import com.cetc32.dh.service.DemandSubmitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.List; @Service @@ -146,4 +147,9 @@ public class DemandSubmitServiceImppl implements DemandSubmitService { public List alldemandclassify(){ return demandSubmitMapper.alldemandclassify(); } + + @Override + public Long countByMonth(String t_start, String t_end){ + return demandSubmitMapper.countByMonth(t_start,t_end); + } } diff --git a/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java index 0757c60b739f1f2e8790b983bb7dc015135551f1..132431198dcfad78c35357b600364d013574a1e5 100644 --- a/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/EstimateTaskServiceImpl.java @@ -136,4 +136,9 @@ public class EstimateTaskServiceImpl implements EstimateTaskService { public List alltaskclassify(){ return estimateTaskMapper.alltaskclassify(); } + + @Override + public Long countByMonth(String t_start, String t_end){ + return estimateTaskMapper.countByMonth(t_start,t_end); + } } diff --git a/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java index 926d9032a7382ab41766789ad60f4ff70635bf69..8897e6da1e13fd3fb8bc0b85e7ad897ce436f26b 100644 --- a/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java @@ -186,4 +186,9 @@ public class ProductdemandServiceImpl implements ProductdemandService { return map; } + @Override + public Long countByMonth(String t_start, String t_end){ + return productdemandMapper.countByMonth(t_start,t_end); + } + } diff --git a/src/main/resources/application-hubinwin.yml b/src/main/resources/application-hubinwin.yml index e4a2667189ca7c8502f7ee9a41fa63b855ffa4ad..c97eb0bbbd0da470f8d1eec0222d4cf300c7a033 100644 --- a/src/main/resources/application-hubinwin.yml +++ b/src/main/resources/application-hubinwin.yml @@ -86,3 +86,6 @@ sso: sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync offlineDataMenuId : 152 +gainMenuId: 21 +plpUrl: /plpData +traceUrl: /traceData diff --git a/src/main/resources/mapper/DemandSubmitMapper.xml b/src/main/resources/mapper/DemandSubmitMapper.xml index 16ebaeb86ee0dc572f08e66942a7de1febf4019e..eee9efa970cf947726338fb246ec196a34097bdb 100644 --- a/src/main/resources/mapper/DemandSubmitMapper.xml +++ b/src/main/resources/mapper/DemandSubmitMapper.xml @@ -374,4 +374,12 @@ from demand_submit group by demand_classify + diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml index b89bc29d2cb35a5e683b5aa467eba53985358530..d531aab339ddac5b64715ac352448aacc793e8bc 100644 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ b/src/main/resources/mapper/EstimateTaskMapper.xml @@ -345,4 +345,13 @@ from estimate_task group by task_classify + + diff --git a/src/main/resources/mapper/ProductdemandMapper.xml b/src/main/resources/mapper/ProductdemandMapper.xml index 1241dc8781ec8ebbb8d1a718dce66c9fcf1f485e..7c5ecbd36dba4cfd18a52999c8f70914bd134fc4 100644 --- a/src/main/resources/mapper/ProductdemandMapper.xml +++ b/src/main/resources/mapper/ProductdemandMapper.xml @@ -347,4 +347,13 @@ order by creattime DESC + + \ No newline at end of file diff --git a/src/test/java/com/cetc32/DataAreaTest.java b/src/test/java/com/cetc32/DataAreaTest.java deleted file mode 100644 index 1dd18f99233646e69ec9d4b557fe7417c4b95aed..0000000000000000000000000000000000000000 --- a/src/test/java/com/cetc32/DataAreaTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************* - * Copyright(C) CETC-32 - * @Description: - * @Author :徐文远 - * @version:1.0 - * @date : 2021/9/18 上午10:52 - ******************************************************************************/ -package com.cetc32; - - -import com.cetc32.dh.DhApplication; -import com.cetc32.dh.common.bean.UserAreaPermision; -import com.cetc32.dh.entity.DataArea; -import com.cetc32.dh.entity.DataFile; -import com.cetc32.dh.entity.ZQArea; -import com.cetc32.dh.mybatis.CityGeomMapper; -import com.cetc32.dh.mybatis.DataAreaMapper; -import com.cetc32.dh.mybatis.DataFileMapper; -import com.cetc32.dh.mybatis.ZqAreaMapper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = DhApplication.class ,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -//@WebAppConfiguration -public class DataAreaTest { - //@Autowired - CityGeomMapper cityGeomMapper; - //@Autowired - ZqAreaMapper zqAreaMapper; - //@Autowired - DataFileMapper dataFileMapper; - @Autowired - DataAreaMapper dataAreaMapper; - - //@Test - public void datafileList(){ - DataFile dataFile =new DataFile(); - UserAreaPermision user =new UserAreaPermision(); - dataFile.setMenuId(147); - List ids =new ArrayList<>(); - ids.add("150100"); - ids.add("150200"); - ids.add("150300"); - ids.add("150400"); - ids.add("150500"); - ids.add("150600"); - ids.add("150700"); - ids.add("150800"); - ids.add("152500"); - user.setAreaCode(ids); - System.out.println(dataFileMapper.selectFilesHasPermission(0,100,dataFile,user,user.getPolygon())); - System.out.println(dataFileMapper.countFilesHasPermission(dataFile,user,user.getPolygon())); - } - - //@Test - public void testZqArea(){ - List ids =new ArrayList<>(); - ids .add("01"); - System.out.println("ZQAreas "+zqAreaMapper.selectAreaByZqId(ids)); - } - @Test - public void insertArea(){ - /*DataArea dataArea =new DataArea(100000L,"110000",99L); - List dataAreas =new ArrayList<>(); - dataAreas.add(dataArea); - dataAreaMapper.insertArea(dataAreas);*/ - - } - //@Test - public void TestSelectCityFromAreaCodes(){ - ArrayList list =new ArrayList(); - list.add("110000"); - list.add("150100"); - list.add("131000"); - System.out.println(cityGeomMapper.selectCityInCodes(list)); - } - - //@Test - public void TestSelectAeraCodeFromCities(){ - ArrayList list =new ArrayList(); - list.add("驻马店市"); - list.add("上海市"); - list.add("深圳市"); - System.out.println(cityGeomMapper.selectCodesInArea(list)); - } - //@Test - public void zhengzebiaodashi(){ - System.out.println(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$","你1好")); - } -} diff --git a/src/test/resources/application-dev.yml b/src/test/resources/application-dev.yml deleted file mode 100644 index 0ce23a83736f3d92e38fdf6fa27ab57658044cac..0000000000000000000000000000000000000000 --- a/src/test/resources/application-dev.yml +++ /dev/null @@ -1,88 +0,0 @@ -server: - port: 8081 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - - -spring: - application: - name: dhManager - datasource: - url: jdbc:postgresql://192.168.1.60:5432/dhmanage - username: postgres - password: 123456 - driver-class-name: org.postgresql.Driver - -# datasource: -# url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 -# username: root -# password: 123 -# initial-size: 1 -# min-idle: 1 -# max-active: 20 -# test-on-borrow: true -# driver-class-name: com.mysql.cj.jdbc.Driver -# type: com.zaxxer.hikari.HikariDataSource - - servlet: - multipart: - max-file-size: 2GB - max-request-size: 2GB - -#设置静态资源路径,多个以逗号分隔 - resources: - static-locations: classpath:static/,file:static/ -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 - -generator: - targetProject: src/main/java - mappers: tk.mybatis.mapper.common.Mapper - javaModel-targetPackage: com.cetc32.dh.entity - sqlMap-targetPackage: mapper - javaClient-targetPackage: com.cetc32.dh.mybatis -logging: - level: - com.cetc32.dh.mybatis: debug - -storePath: /root/ -upLoadPath: ${storePath}upLoad - -rootPath: /root/daohang/data -myPath: ${rootPath}myPath -writePath: ${rootPath}/product -flowPath: ${rootPath}/flowpath/ -upDatePath: ${rootPath}/updatePath/ -downPath: ${rootPath}/downPath -eip: http://192.168.1.42:8080/ -sso: - authcenter: http://192.168.1.42:8087 - verifyUrl: ${sso.authcenter}/rest/auth/verify?token= - passportUrl: ${sso.authcenter}/?ReturnUrl= - defaultLoginRequiredEnable: true - permission: S002^*数据管理@/**;数据员@/rest/**; - #permission: S001^*业务管理@/**;普通用户@/rest/**; - sysurl : http://192.168.1.42:${server.port} - sysname : 数据管理系统 - registerUrl : ${sso.authcenter}/rest/api/sys/sync -offlineDataMenuId : 151 diff --git a/src/test/resources/application-hubinwin.yml b/src/test/resources/application-hubinwin.yml deleted file mode 100644 index 4f5a0ece6803d5d1cdd13bde45fa5ad0cd5a6ad2..0000000000000000000000000000000000000000 --- a/src/test/resources/application-hubinwin.yml +++ /dev/null @@ -1,81 +0,0 @@ -server: - port: 8081 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - - -spring: - application: - name: dhManager - datasource: - url: jdbc:postgresql://192.168.1.60:5432/dhmanage - username: postgres - password: 123456 - driver-class-name: org.postgresql.Driver - -# datasource: -# url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 -# username: root -# password: 123 -# initial-size: 1 -# min-idle: 1 -# max-active: 20 -# test-on-borrow: true -# driver-class-name: com.mysql.cj.jdbc.Driver -# type: com.zaxxer.hikari.HikariDataSource - - servlet: - multipart: - max-file-size: 5GB - max-request-size: 5GB - -#设置静态资源路径,多个以逗号分隔 - resources: - static-locations: classpath:static/,file:static/ -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 - -generator: - targetProject: src/main/java - mappers: tk.mybatis.mapper.common.Mapper - javaModel-targetPackage: com.cetc32.dh.entity - sqlMap-targetPackage: mapper - javaClient-targetPackage: com.cetc32.dh.mybatis -logging: - level: - com.cetc32.dh.mybatis: debug - -storePath: D:\root -upLoadPath: ${storePath}\upLoad -upDatePath: ${storePath}\upDate -downPath: ${storePath}\Down - -rootPath: D:\root\daohang\data -myPath: ${rootPath}\myPath\ -writePath: ${rootPath}\product -flowPath: ${rootPath}\flowpath\ -eip: http://192.168.1.5:8080/ -verifyUrl: http://192.168.1.42:8087/rest/auth/verify?token= -passportUrl: http://192.168.1.42:8087/?ReturnUrl= -defaultLoginRequiredEnable: true - diff --git a/src/test/resources/application-xwy.yml b/src/test/resources/application-xwy.yml deleted file mode 100644 index 1d87a2bd7dd675dc8936759576b28226c6f0b423..0000000000000000000000000000000000000000 --- a/src/test/resources/application-xwy.yml +++ /dev/null @@ -1,92 +0,0 @@ -server: - port: 8082 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - - -spring: - application: - name: dhManager - datasource: - ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage - url: jdbc:postgresql://180.184.65.203:5432/dhmanage - username: postgres - #password: 123456 - password: Zdk@824. - driver-class-name: org.postgresql.Driver - - # datasource: - # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 - # username: root - # password: 123 - # initial-size: 1 - # min-idle: 1 - # max-active: 20 - # test-on-borrow: true - # driver-class-name: com.mysql.cj.jdbc.Driver - # type: com.zaxxer.hikari.HikariDataSource - - servlet: - multipart: - max-file-size: 5GB - max-request-size: 5GB - - #设置静态资源路径,多个以逗号分隔 - resources: - static-locations: classpath:static/,file:static/ -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 - -generator: - targetProject: src/main/java - mappers: tk.mybatis.mapper.common.Mapper - javaModel-targetPackage: com.cetc32.dh.entity - sqlMap-targetPackage: mapper - javaClient-targetPackage: com.cetc32.dh.mybatis -logging: - level: - com.cetc32.dh.mybatis: debug - -storePath: /root/ -upLoadPath: ${storePath}upLoad - -rootPath: /root/daohang/data -myPath: ${rootPath}myPath -writePath: ${rootPath}/product -flowPath: ${rootPath}/flowpath/ -upDatePath: ${rootPath}/updatePath/ -downPath: ${rootPath}/downPath -eip: http://192.168.1.206:8080/ -gainMenuId: 10 -sso: - ##authcenter: http://192.168.1.206:8081 - authcenter: http://180.184.65.203:8087 - verifyUrl: ${sso.authcenter}/rest/auth/verify?token= - passportUrl: ${sso.authcenter}/?ReturnUrl= - defaultLoginRequiredEnable: true - permission: S002^*数据管理@/**;数据员@/rest/**; - #permission: S001^*业务管理@/**;普通用户@/rest/**; - sysurl : http://192.168.1.206:${server.port} - sysname : 数据管理系统 - registerUrl : ${sso.authcenter}/rest/api/sys/sync -offlineDataMenuId : 151 diff --git a/src/test/resources/application-xwy2.yml b/src/test/resources/application-xwy2.yml deleted file mode 100644 index 931363aa651f0ebfe8616e00623ac3fbcebef450..0000000000000000000000000000000000000000 --- a/src/test/resources/application-xwy2.yml +++ /dev/null @@ -1,72 +0,0 @@ -server: - port: 8081 - -spring: - application: - name: dhManager - datasource: - url: jdbc:mysql://192.168.1.211:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 - username: root - password: 123 - # initial-size: 1 - # min-idle: 1 - # max-active: 20 - # test-on-borrow: true - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.zaxxer.hikari.HikariDataSource - thymeleaf: - cache: false - servlet: - multipart: - max-file-size: 500MB - max-request-size: 500MB - - redis: - database: 0 -# Redis服务器地址 - host: 192.168.1.206 -# Redis服务器连接端口 - port: 6524 -# Redis服务器连接密码(默认为空) - password: E6346913E58C304C -# 连接池最大连接数(使用负值表示没有限制) - max-active: 200 -# 连接池最大阻塞等待时间(使用负值表示没有限制) - pool: - max-wait: -1 -# 连接池中的最大空闲连接 - max-idle: 10 -# 连接池中的最小空闲连接 - min-idle: 0 -# 连接超时时间(毫秒) - timeout: 1000 - - -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 - -#设置静态资源路径,多个以逗号分隔 -spring.resources.static-locations: classpath:static/,file:static/ - -storePath: /root/ -upLoadPath: ${storePath}upLoad/ - - -generator: - targetProject: src/main/java - mappers: tk.mybatis.mapper.common.Mapper - javaModel-targetPackage: com.cetc32.dh.entity - sqlMap-targetPackage: mapper - javaClient-targetPackage: com.cetc32.dh.mybatis -logging: - level: - com.cetc32.dh.mybatis: debug - - -rootPath: /root/daohang/data -myPath: ${rootPath}myPath -writePath: ${rootPath}/product - diff --git a/src/test/resources/application-xwybjb.yml b/src/test/resources/application-xwybjb.yml deleted file mode 100644 index 52cfd6376fa7daade920b2ccc1db2aec72e777e8..0000000000000000000000000000000000000000 --- a/src/test/resources/application-xwybjb.yml +++ /dev/null @@ -1,94 +0,0 @@ -server: - port: 8082 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - - -spring: - application: - name: dhManager - datasource: - ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage - #url: jdbc:postgresql://180.184.65.203:5432/dhmanage - url: jdbc:postgresql://localhost:5432/dhmanage - username: postgres - password: 123456 - #password: Zdk@824. - driver-class-name: org.postgresql.Driver - - # datasource: - # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 - # username: root - # password: 123 - # initial-size: 1 - # min-idle: 1 - # max-active: 20 - # test-on-borrow: true - # driver-class-name: com.mysql.cj.jdbc.Driver - # type: com.zaxxer.hikari.HikariDataSource - - servlet: - multipart: - max-file-size: 5GB - max-request-size: 5GB - - #设置静态资源路径,多个以逗号分隔 - resources: - static-locations: classpath:static/,file:static/ -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 - -generator: - targetProject: src/main/java - mappers: tk.mybatis.mapper.common.Mapper - javaModel-targetPackage: com.cetc32.dh.entity - sqlMap-targetPackage: mapper - javaClient-targetPackage: com.cetc32.dh.mybatis -logging: - level: - com.cetc32.dh.mybatis: debug - -storePath: /root/ -upLoadPath: ${storePath}upLoad - -rootPath: /root/daohang/data -myPath: ${rootPath}myPath -writePath: ${rootPath}/product -flowPath: ${rootPath}/flowpath/ -upDatePath: ${rootPath}/updatePath/ -downPath: ${rootPath}/downPath -eip: http://192.168.1.206:8080/ -sso: - #authcenter: http://192.168.1.206:8081 - #authcenter: http://180.184.65.203:8087 - authcenter: http://localhost:8081 - verifyUrl: ${sso.authcenter}/rest/auth/verify?token= - passportUrl: ${sso.authcenter}/?ReturnUrl= - defaultLoginRequiredEnable: true - permission: S002^*数据管理@/**;数据员@/rest/**; - #permission: S001^*业务管理@/**;普通用户@/rest/**; - sysurl : http://192.168.1.206:${server.port} - sysname : 数据管理系统 - registerUrl : ${sso.authcenter}/rest/api/sys/sync -offlineDataMenuId : 151 -gainMenuId: 21 diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml deleted file mode 100644 index 7737de8b3bdcfe8aedb6f64772b9664a4ba4cb83..0000000000000000000000000000000000000000 --- a/src/test/resources/application.yml +++ /dev/null @@ -1,93 +0,0 @@ -server: - port: 8082 - server.connectionTimeout: 18000000 - - - -## redis setting -# jedis.pool.host=localhost -# jedis.pool.port=6379 -# jedis.pool.timeout=3000000 -# jedis.pool.config.maxTotal=100 -# jedis.pool.config.maxIdle=10 -# jedis.pool.config.maxWaitMillis=10000 -# -# -# #thymeleaf -# spring.thymeleaf.prefix=classpath:/templates/ -# spring.thymeleaf.suffix=.html -# spring.thymeleaf.mode=LEGACYHTML5 -# spring.thymeleaf.encoding=UTF-8 -# spring.thymeleaf.cache=false - - -spring: - application: - name: dhManager - datasource: - ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage - url: jdbc:postgresql://180.184.65.203:5432/dhmanage - username: postgres - #password: 123456 - password: Zdk@824. - driver-class-name: org.postgresql.Driver - - # datasource: - # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 - # username: root - # password: 123 - # initial-size: 1 - # min-idle: 1 - # max-active: 20 - # test-on-borrow: true - # driver-class-name: com.mysql.cj.jdbc.Driver - # type: com.zaxxer.hikari.HikariDataSource - - servlet: - multipart: - max-file-size: 5GB - max-request-size: 5GB - - #设置静态资源路径,多个以逗号分隔 - resources: - static-locations: classpath:static/,file:static/ -mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 - -generator: - targetProject: src/main/java - mappers: tk.mybatis.mapper.common.Mapper - javaModel-targetPackage: com.cetc32.dh.entity - sqlMap-targetPackage: mapper - javaClient-targetPackage: com.cetc32.dh.mybatis -logging: - level: - com.cetc32.dh.mybatis: debug - -storePath: /root/ -upLoadPath: ${storePath}upLoad - -rootPath: /root/daohang/data -myPath: ${rootPath}myPath -writePath: ${rootPath}/product -flowPath: ${rootPath}/flowpath/ -upDatePath: ${rootPath}/updatePath/ -downPath: ${rootPath}/downPath -eip: http://192.168.1.206:8080/ - -gainMenuId: 10 -sso: - ##authcenter: http://192.168.1.206:8081 - authcenter: http://180.184.65.203:8087 - verifyUrl: ${sso.authcenter}/rest/auth/verify?token= - passportUrl: ${sso.authcenter}/?ReturnUrl= - defaultLoginRequiredEnable: true - permission: S002^*数据管理@/**;数据员@/rest/**; - #permission: S001^*业务管理@/**;普通用户@/rest/**; - sysurl : http://192.168.1.206:${server.port} - sysname : 数据管理系统 - registerUrl : ${sso.authcenter}/rest/api/sys/sync -offlineDataMenuId : 151 diff --git a/src/test/resources/generator.xml b/src/test/resources/generator.xml deleted file mode 100644 index 12e5437e2d93a898a79d31f26a6d884a8feb7384..0000000000000000000000000000000000000000 --- a/src/test/resources/generator.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
-
diff --git a/src/test/resources/generator_mysql.xml b/src/test/resources/generator_mysql.xml deleted file mode 100644 index f8be6736b4ec9250f5c446f7722666ad21968a8e..0000000000000000000000000000000000000000 --- a/src/test/resources/generator_mysql.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
-
\ No newline at end of file diff --git a/src/test/resources/jdbc.properties b/src/test/resources/jdbc.properties deleted file mode 100644 index 4c7436ca4b49eae0dd5b4246ecbed572eb3dfda4..0000000000000000000000000000000000000000 --- a/src/test/resources/jdbc.properties +++ /dev/null @@ -1,32 +0,0 @@ -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false -##spring.datasource.driverClassName=com.mysql.jdbc.Driver -#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -#spring.datasource.username=root -#spring.datasource.password=123 - -spring.datasource.url=jdbc:postgresql://192.168.1.60:5432/dhmanage -spring.datasource.username=postgres -spring.datasource.password=123456 -spring.datasource.driver-class-name=org.postgresql.Driver - -#Mybatis扫描 -mybatis.mapper-locations=classpath*:com/**/mapper/**.xml - -# Generator -generator.targetProject=src/main/java -#mapper的父类 -generator.mappers=tk.mybatis.mapper.common.Mapper -#pojo所在报名 -generator.javaModel-targetPackage=com.cetc32.dh.entity -#mapper.xml位于resource文件夹下的哪个目录中 -generator.sqlMap-targetPackage=mapper -#mapper包名 -generator.javaClient-targetPackage=com.cetc32.dh.mybatis - -#配置文件传输 -spring.servlet.multipart.enabled =true -spring.servlet.multipart.file-size-threshold =0 -#单个数据的大小 -spring.servlet.multipart.max-file-size = 50GB -#总数据的大小 -spring.servlet.multipart.max-request-size=50GB diff --git a/src/test/resources/mysql-connector-java-8.0.21.jar b/src/test/resources/mysql-connector-java-8.0.21.jar deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/test/resources/postgresql-42.2.18.jar b/src/test/resources/postgresql-42.2.18.jar deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000