From 4c338e91975c4bab98d76f2a2b2a47780141a516 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 May 2021 18:39:47 +0800 Subject: [PATCH 01/45] 1 --- src/main/resources/application-dev.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fefbba4..2a29c48 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -25,7 +25,7 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://localhost:5432/dhmanage + url: jdbc:postgresql://192.168.1.60:5432/dhmanage username: postgres password: 123456 driver-class-name: org.postgresql.Driver @@ -67,12 +67,14 @@ logging: storePath: /root/ upLoadPath: ${storePath}upLoad +upDatePath: ${storePath}\upDate +downPath: ${storePath}\Down rootPath: /root/daohang/data myPath: ${rootPath}/myPath/ writePath: ${rootPath}/product flowPath: ${rootPath}/flowpath/ -eip: http://192.168.1.209:8080/ -verifyUrl: http://192.168.1.206:8888/rest/auth/verify?token= -passportUrl: http://192.168.1.206:8888/?ReturnUrl= +eip: http://192.168.1.42:8080/ +verifyUrl: http://192.168.1.42:8087/rest/auth/verify?token= +passportUrl: http://192.168.1.42:8087/?ReturnUrl= defaultLoginRequiredEnable: true -- Gitee From 3b3f578543ae44f370b8c765718cd94365dae975 Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Tue, 22 Jun 2021 14:39:14 +0800 Subject: [PATCH 02/45] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E5=95=A5=EF=BC=8C=E7=9C=8B=E7=9D=80=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/DemanSubmitController.java | 1 + src/main/java/com/cetc32/dh/utils/FileUtil.java | 4 ++-- src/main/resources/application-dev.yml | 16 +++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) 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 aae3bc9..3fdb730 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -306,6 +306,7 @@ public class DemanSubmitController extends BaseController{ @ApiImplicitParam(name = "userid", value = "用户id", paramType = "body", dataType = "Integer"), }) public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile[] file, Integer userid) { + System.out.println("1"); // String filepath = "/root/upLoad"; String upCachePath=myPath+"_user"+userid; String filepath = upCachePath; diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java index 4312ec4..1ecb71a 100644 --- a/src/main/java/com/cetc32/dh/utils/FileUtil.java +++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java @@ -92,8 +92,8 @@ public class FileUtil { for (int i = 0; i < files.length; i++) { String flag = ""; MultipartFile file = files[i]; - String fileName = file.getOriginalFilename().replace("\\",File.separator);//获取文件名 - fileName=fileName.replace("/",File.separator); + String fileName = file.getOriginalFilename().replaceAll("\\\\",File.separator);//获取文件名 + fileName=fileName.replaceAll("/",File.separator); String dirName = filepath +File.separator + fileName; FileDir = fileName; System.out.println(FileDir); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e554093..8c37793 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -25,7 +25,7 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://localhost:5432/dhmanage + url: jdbc:postgresql://192.168.1.60:5432/dhmanage username: postgres password: 123456 driver-class-name: org.postgresql.Driver @@ -73,7 +73,13 @@ rootPath: /root/daohang/data myPath: ${rootPath}/myPath/ writePath: ${rootPath}/product flowPath: ${rootPath}/flowpath/ -eip: http://192.168.1.209:8080/ -verifyUrl: http://192.168.1.206:8888/rest/auth/verify?token= -passportUrl: http://192.168.1.206:8888/?ReturnUrl= -defaultLoginRequiredEnable: false +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: S001^admin@/**;*业务管理@/**;数据管理@/**;user@/rest/**; + sysurl : http://192.168.1.42:${server.port} + sysname : 导航服务 + registerUrl : ${sso.authcenter}/rest/api/sys -- Gitee From c85baf56c636588a09acbea8b5a838298f58547d Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 9 Jul 2021 09:11:15 +0800 Subject: [PATCH 03/45] =?UTF-8?q?7-9=20=20=E5=AE=89=E5=85=A8=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E5=92=8C=E7=9B=AE=E5=BD=95=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/DataFileController.java | 19 ++++- .../controller/rest/DataMenuController.java | 71 +++++++++++-------- .../dh/controller/rest/DataPlpController.java | 23 ++++-- .../controller/rest/DataTraceController.java | 17 +++++ .../rest/OtherInterfaceController.java | 3 +- .../java/com/cetc32/dh/entity/DataFile.java | 23 +++--- .../java/com/cetc32/dh/entity/DataPlp.java | 10 +-- .../java/com/cetc32/dh/entity/DataTrace.java | 10 +-- .../com/cetc32/dh/mybatis/DataFileMapper.java | 4 +- .../com/cetc32/dh/mybatis/DataPlpMapper.java | 4 +- .../cetc32/dh/mybatis/DataTraceMapper.java | 2 +- .../cetc32/dh/service/DataFileService.java | 4 +- .../com/cetc32/dh/service/DataPlpService.java | 2 +- .../dh/service/impl/DataFileServiceImpl.java | 6 +- .../dh/service/impl/DataPlpServiceImpl.java | 4 +- src/main/resources/mapper/DataFileMapper.xml | 14 ++-- src/main/resources/mapper/DataMenuMapper.xml | 14 ++-- src/main/resources/mapper/DataPlpMapper.xml | 9 ++- src/main/resources/mapper/DataTraceMapper.xml | 6 +- 19 files changed, 155 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index 3257962..81f0058 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -447,12 +447,29 @@ public class DataFileController { return ResponseResult.error("表单信息提交失败！"); } + /** + * 记录数据详情展示 + * + * @param fileId 件id + * @return 返回记录数据详情结果 + */ + @ApiOperation(value = "查看记录详情") + @RequestMapping(value = "/comdetail", method = RequestMethod.GET) + public ResponseResult comDetail(Long fileId) { + DataFile dataFile = dataFileService.queryById(fileId); + if(dataFile!=null){ + return ResponseResult.success(200,"详情",dataFile); + }else{ + return ResponseResult.error("未查找到相关信息，请输入正确的参数！"); + } + } + + /** * 目录/文件提交上传 * * @param file 目录，文件 - * @param userId 用户id * @return 返回文件提交结果 */ @ApiOperation(value = "提交时文件上传") diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java index 096a263..68fef16 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java @@ -18,10 +18,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.io.File; import java.util.*; @@ -69,22 +66,6 @@ public class DataMenuController { return ResponseResult.success(count); } - /** - * 根据编目id查询目录节点 - * - * @param id - * @return 返回查询结果 - * 备注:无 - */ - //@PostMapping(value = "/select") - public ResponseResult select(Long id) { - - DataMenu dataMenu = dataMenuService.queryById(id); - if (dataMenu == null) { - return ResponseResult.error("没有id=" + id + "的datamenu！"); - } - return ResponseResult.success(dataMenu); - } /** * 根据编目id删除目录节点(单个) @@ -179,19 +160,29 @@ public class DataMenuController { } /** - * 根据编目节点id，更新编目节点 + * 根据编目节点id，更新编目节点，只更新编目的描述信息 * - * @param dataMenu + * @param menuId 编目节点id * @return 返回更新结果 * 备注:无 */ - //@PostMapping(value = "/updateDataMenu") - public ResponseResult updateDataMenu(DataMenu dataMenu) { -// dataMenu=new DataMenu(5L,"test5",1L,"test5","test5555"); - Integer count = dataMenuService.updatebyId(dataMenu); - return ResponseResult.success(count); + @PostMapping(value = "/updateMenu") + public ResponseResult updateDataMenu(@RequestBody DataMenu dataMenu) { +// DataMenu dataMenu = dataMenuService.queryById(menuId); +// dataMenu.setDiscription(discription); + System.out.println(dataMenu.getDiscription()); + if(dataMenu!=null){ + if(dataMenuService.updatebyId(dataMenu)>0){ + return ResponseResult.success(200,"更新成功","编目"+dataMenuService.queryById(dataMenu.getId()).getMenuName()+"更新成功！"); + }else{ + return ResponseResult.error("更新失败！"); + } + }else{ + return ResponseResult.error("未找到对应的编目，请输入正确的参数！"); + } } + /** * 根据目录节点id，删除目录树(包括子树) * @@ -259,8 +250,6 @@ public class DataMenuController { return ResponseResult.success(id); } return ResponseResult.error("请输入正确的key！"); - - } /** @@ -294,6 +283,28 @@ public class DataMenuController { return ResponseResult.success(dataMenuDTO.getChildren()); } + /** + * 显示单个目录信息 + * + * @param menuId + * @return 返回展示结果 + * 备注:无 + */ + @ApiOperation(value = "显示单个目录信息") + @GetMapping(value = "/showMenu") + public ResponseResult showMenu(Long menuId) { + Map map = new HashMap<>(); + DataMenu dataMenu = dataMenuService.queryById(menuId); + if(dataMenu!=null){ + map.put("目录名称",dataMenu.getMenuName()); + map.put("目录描述信息",dataMenu.getDiscription()); + return ResponseResult.success(map); + }else { + return ResponseResult.error("未找到对应的目录，请传入正确的参数！"); + } + + } + /** * (目录名称)编目名称和编目id * @@ -310,6 +321,8 @@ public class DataMenuController { } return ResponseResult.success(hashMapList); } + + } diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java index 92cf50b..e85c041 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java @@ -17,10 +17,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.*; @@ -73,6 +70,24 @@ public class DataPlpController { } + /** + * 记录数据详情展示 + * + * @param id 文件id + * @return 返回记录数据详情结果 + */ + @ApiOperation(value = "查看记录详情") + @RequestMapping(value = "/plpdetail", method = RequestMethod.GET) + public ResponseResult plpDetail(Integer id) { + DataPlp dataPlp = dataPlpService.queryById(id); + if(dataPlp!=null){ + return ResponseResult.success(200,"详情",dataPlp); + }else{ + return ResponseResult.error("未查找到相关信息，请输入正确的参数！"); + } + } + + /** * 根据编目节点id查询通过的点线面数据 * diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java index e508046..14d3190 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java @@ -151,6 +151,23 @@ public class DataTraceController { } + /** + * 记录数据详情展示 + * + * @param id 文件id + * @return 返回记录数据详情结果 + */ + @ApiOperation(value = "查看记录详情") + @RequestMapping(value = "/tracedetail", method = RequestMethod.GET) + public ResponseResult traceDetail(Integer id) { + DataTrace dataTrace = dataTraceService.queryById(id); + if(dataTrace!=null){ + return ResponseResult.success(200,"详情",dataTrace); + }else{ + return ResponseResult.error("未查找到相关信息，请输入正确的参数！"); + } + } + /** * 审批通过已导入的轨迹数据 * 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 23810b8..5f18de4 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -193,6 +193,7 @@ public class OtherInterfaceController { @ApiOperation(value = "数据获取",notes = "数据获取获取指定时间空间数据") @GetMapping(value = "/export/ploygon") public ResponseData DataPloygon(@RequestBody Map map) { + String status = "审批通过"; SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd" ); Date startTime; Date endTime; @@ -208,7 +209,7 @@ public class OtherInterfaceController { { return ResponseData.error("缺少参数 polygon "); } - return ResponseData.success(dataPlpService.selectPloygon(startTime,endTime,polygon)); + return ResponseData.success(dataPlpService.selectPloygon(status,startTime,endTime,polygon)); } diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java index d898c5c..457f5b3 100644 --- a/src/main/java/com/cetc32/dh/entity/DataFile.java +++ b/src/main/java/com/cetc32/dh/entity/DataFile.java @@ -40,8 +40,7 @@ public class DataFile extends NumberS { /** * 数据安全等级，文件(夹)安全等级 */ - @Column(name = "file_security") - private String fileSecurity; + private Integer security; /** * 数据路径，文件(夹)存放路径 @@ -200,7 +199,7 @@ public class DataFile extends NumberS { * @param id * @param fileName * @param area - * @param fileSecurity + * @param security * @param filePath * @param createTime * @param region @@ -219,14 +218,14 @@ public class DataFile extends NumberS { * @param submitor * @param approver 有参构造函数 */ - public DataFile(Long id, String fileName, String area, String fileSecurity, String filePath, Date createTime, String region, java.sql.Date fileTime, Long fileSize, + public DataFile(Long id, String fileName, String area, Integer security, String filePath, Date createTime, String region, java.sql.Date fileTime, Long fileSize, Integer fileNumbers, String fileDiscription, String submitor, String approver, String gcs, Integer scanLevel, String scale, String lan, String lon, String catagory, String status, Integer menuId, String fileConfig, Date approveTime, Integer userId, List regionList, String startTime, String endTime, String[] timeRange, String td_end, String td_start) { this.id = id; this.fileName = fileName; this.area = area; - this.fileSecurity = fileSecurity; + this.security = security; this.createTime = createTime; this.filePath = filePath; this.region = region; @@ -385,19 +384,19 @@ public class DataFile extends NumberS { /** * 获取数据安全等级，文件(夹)安全等级 * - * @return file_security - 数据安全等级，文件(夹)安全等级 + * @return security - 数据安全等级，文件(夹)安全等级 */ - public String getFileSecurity() { - return fileSecurity; + public Integer getSecurity() { + return security; } /** * 设置数据安全等级，文件(夹)安全等级 * - * @param fileSecurity 数据安全等级，文件(夹)安全等级 + * @param security 数据安全等级，文件(夹)安全等级 */ - public void setFileSecurity(String fileSecurity) { - this.fileSecurity = fileSecurity == null ? null : fileSecurity.trim(); + public void setSecurity(Integer security) { + this.security = security; } /** @@ -828,7 +827,7 @@ public class DataFile extends NumberS { "menuId=" + menuId + '\'' + "fileName=" + fileName + '\'' + ", area='" + area + '\'' + - ", fileSecurity=" + fileSecurity + '\'' + + ", security=" + security + '\'' + ", filePath=" + filePath + '\'' + ", createTime=" + createTime + '\'' + ", region=" + region + '\'' + diff --git a/src/main/java/com/cetc32/dh/entity/DataPlp.java b/src/main/java/com/cetc32/dh/entity/DataPlp.java index 77b7079..3f54b50 100644 --- a/src/main/java/com/cetc32/dh/entity/DataPlp.java +++ b/src/main/java/com/cetc32/dh/entity/DataPlp.java @@ -73,7 +73,7 @@ public class DataPlp extends NumberS { /** * 数据安全等级 */ - private String security; + private Integer security; /** * 审批人 @@ -172,7 +172,7 @@ public class DataPlp extends NumberS { * @param description * @param submitor 有参构造函数 */ - public DataPlp(Integer id, String fileName, String eventType, String security, Date createTime, String region, String fileTime, + public DataPlp(Integer id, String fileName, String eventType, Integer security, Date createTime, String region, String fileTime, String description, Integer userId, String approver, String status, String fileConfig, Date approveTime, String points, Integer menuId, String reserver2, byte[] photoByte, String submitor, String[] timeRange, String td_start, String td_end) { this.id = id; @@ -455,7 +455,7 @@ public class DataPlp extends NumberS { * * @return security - 数据安全等级 */ - public String getSecurity() { + public Integer getSecurity() { return security; } @@ -464,8 +464,8 @@ public class DataPlp extends NumberS { * * @param security 数据安全等级 */ - public void setSecurity(String security) { - this.security = security == null ? null : security.trim(); + public void setSecurity(Integer security) { + this.security = security; } /** diff --git a/src/main/java/com/cetc32/dh/entity/DataTrace.java b/src/main/java/com/cetc32/dh/entity/DataTrace.java index f499d50..acad71a 100644 --- a/src/main/java/com/cetc32/dh/entity/DataTrace.java +++ b/src/main/java/com/cetc32/dh/entity/DataTrace.java @@ -58,7 +58,7 @@ public class DataTrace extends NumberS { * @param menuId * 有参构造函数 */ - public DataTrace(Integer id, String security, Date createTime, String fileTime, String description, Integer userId, String approver, String status, + public DataTrace(Integer id, Integer security, Date createTime, String fileTime, String description, Integer userId, String approver, String status, String fileConfig, Date approveTime, String lat, String lon, Integer speed, Integer direction, Integer locsource, Integer coordinateerror, String deviceid, Integer encrylongitude, Integer enccrylatitude, Boolean flag, String points, String linkid, String submitor, Date startTime, Date endTime, String filePath, String fileSize, String fileName, Integer menuId, String td_start, String td_end) { @@ -260,7 +260,7 @@ public class DataTrace extends NumberS { /** * 安全等级 */ - private String security; + private Integer security; /** * 提交用户姓名 @@ -751,7 +751,7 @@ public class DataTrace extends NumberS { * * @return security - 安全等级 */ - public String getSecurity() { + public Integer getSecurity() { return security; } @@ -760,8 +760,8 @@ public class DataTrace extends NumberS { * * @param security 安全等级 */ - public void setSecurity(String security) { - this.security = security == null ? null : security.trim(); + public void setSecurity(Integer security) { + this.security = security; } /** diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java index a4f5acb..2f35496 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java @@ -83,10 +83,10 @@ public interface DataFileMapper extends Mapper { /** * 根据安全等级查询文件数据 * - * @param fileSecurity 文件安全等级 + * @param security 文件安全等级 * @return 返回查询结果 */ - public List queryAllByFileSecurity(String fileSecurity); + public List queryAllByFileSecurity(Integer security); /** * 根据安状态和用户查询文件数据 diff --git a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java index 6312b48..261b0a9 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java @@ -43,7 +43,7 @@ public interface DataPlpMapper extends Mapper { public Integer insertCollected(DataCollected data); - public List selectPloygon(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("polygon") String polygon); + public List selectPloygon(@Param("status") String status,@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("polygon") String polygon); /** * 根据id更新点线面数据记录 @@ -91,7 +91,7 @@ public interface DataPlpMapper extends Mapper { * @param security 安全等级 * @return 返回查询结果 */ - public List queryAllByFileSecurity(String security); + public List queryAllByFileSecurity(Integer security); /** * 根据状态和审批用户查询点线面数据 diff --git a/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java index 631607f..fcb2949 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataTraceMapper.java @@ -84,7 +84,7 @@ public interface DataTraceMapper extends Mapper { * @param security 轨迹数据安全等级 * @return 返回查询结果 */ - public List queryAllByFileSecurity(String security); + public List queryAllByFileSecurity(Integer security); /** * 根据安状态和用户查询轨迹数据 diff --git a/src/main/java/com/cetc32/dh/service/DataFileService.java b/src/main/java/com/cetc32/dh/service/DataFileService.java index 15ed4de..4f38746 100644 --- a/src/main/java/com/cetc32/dh/service/DataFileService.java +++ b/src/main/java/com/cetc32/dh/service/DataFileService.java @@ -80,10 +80,10 @@ public interface DataFileService { /** * 根据安全等级查询文件数据 * - * @param fileSecurity 文件安全等级 + * @param security 文件安全等级 * @return 返回查询结果 */ - public List queryAllByFileSecurity(String fileSecurity); + public List queryAllByFileSecurity(Integer security); /** * 根据安状态和用户查询文件数据 diff --git a/src/main/java/com/cetc32/dh/service/DataPlpService.java b/src/main/java/com/cetc32/dh/service/DataPlpService.java index e0441e6..d13672a 100644 --- a/src/main/java/com/cetc32/dh/service/DataPlpService.java +++ b/src/main/java/com/cetc32/dh/service/DataPlpService.java @@ -26,7 +26,7 @@ public interface DataPlpService { public Integer insertCollected(DataCollected data); - public List selectPloygon(Date startTime, Date endTime, String polygon); + public List selectPloygon(String status,Date startTime, Date endTime, String polygon); /** * 统计所有的点线面数据个数 diff --git a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java index e4b4e95..832cf70 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java @@ -139,12 +139,12 @@ public class DataFileServiceImpl implements DataFileService { /** * 根据安全等级查询文件数据 * - * @param fileSecurity 文件安全等级 + * @param security 文件安全等级 * @return 返回查询结果 */ @Override - public List queryAllByFileSecurity(String fileSecurity) { - return dataFileMapper.queryAllByFileSecurity(fileSecurity); + public List queryAllByFileSecurity(Integer security) { + return dataFileMapper.queryAllByFileSecurity(security); } /** diff --git a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java index 96b90bd..c9b0bef 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java @@ -37,8 +37,8 @@ public class DataPlpServiceImpl implements DataPlpService { } @Override - public List selectPloygon(Date startTime, Date endTime, String polygon) { - return dataPlpMapper.selectPloygon(startTime, endTime, polygon); + public List selectPloygon(String status,Date startTime, Date endTime, String polygon) { + return dataPlpMapper.selectPloygon(status,startTime, endTime, polygon); } /** diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml index c36abd7..721558a 100644 --- a/src/main/resources/mapper/DataFileMapper.xml +++ b/src/main/resources/mapper/DataFileMapper.xml @@ -7,7 +7,7 @@ --> - + @@ -49,8 +49,8 @@ - - file_security, + + security, @@ -134,8 +134,8 @@ - - #{fileSecurity,jdbcType=VARCHAR}, + + #{security,jdbcType=INTEGER}, @@ -322,8 +322,8 @@ file_name = #{fileName,jdbcType=VARCHAR}, - - file_security = #{fileSecurity,jdbcType=VARCHAR}, + + security = #{security,jdbcType=INTEGER}, file_path = #{filePath,jdbcType=VARCHAR}, diff --git a/src/main/resources/mapper/DataMenuMapper.xml b/src/main/resources/mapper/DataMenuMapper.xml index 5c0f6cc..062cda6 100644 --- a/src/main/resources/mapper/DataMenuMapper.xml +++ b/src/main/resources/mapper/DataMenuMapper.xml @@ -123,12 +123,12 @@ update data_menu - - menu_name = #{menuName,jdbcType=VARCHAR}, - - - pid = #{pid,jdbcType=BIGINT}, - + + + + + + discription = #{discription,jdbcType=VARCHAR}, @@ -198,4 +198,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mapper/DataPlpMapper.xml b/src/main/resources/mapper/DataPlpMapper.xml index 01a8f9f..c17d65a 100644 --- a/src/main/resources/mapper/DataPlpMapper.xml +++ b/src/main/resources/mapper/DataPlpMapper.xml @@ -12,7 +12,7 @@ - + @@ -131,7 +131,7 @@ - #{security,jdbcType=VARCHAR}, + #{security,jdbcType=INTEGER}, @@ -247,6 +247,9 @@ @@ -122,6 +123,11 @@ area + + + img_example, + + @@ -207,6 +213,11 @@ #{area,jdbcType=VARCHAR}, + + + #{imgExample,jdbcType=VARCHAR}, + + @@ -386,6 +397,9 @@ area = #{area,jdbcType=VARCHAR}, + + img_example = #{imgExample,jdbcType=VARCHAR}, + approve_time = now() -- Gitee From b3068800b0737a9a08dde3a0e79b40804681e91a Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Wed, 21 Jul 2021 17:05:15 +0800 Subject: [PATCH 06/45] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E4=B8=9A=E7=AE=A1Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/rest/DemanSubmitController.java | 7 ++++++- .../cetc32/dh/controller/rest/EstimateTaskController.java | 7 ++++++- .../cetc32/dh/controller/rest/ProductDemandController.java | 7 ++++++- src/main/resources/application-dev.yml | 6 +++--- 4 files changed, 21 insertions(+), 6 deletions(-) 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 2faa636..7781fb5 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -74,12 +74,17 @@ public class DemanSubmitController { 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<>(); Integer count = 0; demandlist = demandSubmitService.findAll(); count = demandSubmitService.countDemand(); return new PageDataResult(count,demandlist,page * results); - }else{ + }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; 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 ae6ffea..3c37bad 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java @@ -4,6 +4,7 @@ import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.dto.EstimateDTO; import com.cetc32.dh.entity.BaseAdminUser; +import com.cetc32.dh.entity.DemandSubmit; import com.cetc32.dh.entity.EstimateTask; import com.cetc32.dh.entity.vEstimate; import com.cetc32.dh.service.AdminUserService; @@ -63,7 +64,11 @@ public class EstimateTaskController { List estimateTasks = estimateTaskService.findAll(); Integer count = estimateTaskService.countEstimate(); return new PageDataResult(count,estimateTasks,page * results); - }else { + }else if(StringUtils.isNotBlank(vEstimate.name)&&(vEstimate.name.contains("%"))){ + List demandlist = new ArrayList<>(); + return new PageDataResult(0,demandlist,0); + } + else { if(StringUtils.isNotBlank(vEstimate.getName())) vEstimate.setName("%"+vEstimate.getName()+"%"); if(vEstimate.classify.equals("全部分类")){ diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java index fa75757..2298dc2 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java @@ -71,7 +71,11 @@ public class ProductDemandController { List productdemands = productdemandService.findAll(); Integer count = productdemandService.countProduct(); return new PageDataResult(count,productdemands,page * results); - }else { + }else if(StringUtils.isNotBlank(vProduct.name)&&(vProduct.name.contains("%"))){ + List demandlist = new ArrayList<>(); + return new PageDataResult(0,demandlist,0); + } + else { if(StringUtils.isNotBlank(vProduct.getName())) vProduct.setName("%"+vProduct.getName()+"%"); List productdemands = productdemandService.queryFilesByObj(vProduct); @@ -114,6 +118,7 @@ public class ProductDemandController { String region = String.join(",",regions); productdemand.setTaskdocument(region); JSONObject json = productDTO.getFlow(); + String compaiRegion = json.toJSONString(); if (StringUtils.isBlank(productdemand.getName())) { return ResponseResult.error("传入值为空！"); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ec057b9..1bfcf7f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -74,15 +74,15 @@ writePath: ${rootPath}/product flowPath: ${rootPath}/flowpath/ upDatePath: ${rootPath}/updatePath/ downPath: ${rootPath}/downPath -eip: http://192.168.1.209:8080/ +eip: http://192.168.1.42:8080/ sso: - authcenter: http://192.168.1.60:8087 + 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.206:${server.port} + sysurl : http://192.168.1.42:${server.port} sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync offlineDataMenuId : 151 -- Gitee From 14d5c6059ec06b75c939d0850715f18d27c326e7 Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Tue, 27 Jul 2021 10:55:53 +0800 Subject: [PATCH 07/45] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8A=E6=8A=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/DemandSubmitMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/DemandSubmitMapper.xml b/src/main/resources/mapper/DemandSubmitMapper.xml index 2b9b904..79f4a21 100644 --- a/src/main/resources/mapper/DemandSubmitMapper.xml +++ b/src/main/resources/mapper/DemandSubmitMapper.xml @@ -302,7 +302,7 @@ and demand_name like #{name} - and approver = #{people} + and reporter = #{people} and status = #{status} -- Gitee From 0dcfe0c1f1577ed6f3dba50576ce398b728c237f Mon Sep 17 00:00:00 2001 From: root <123> Date: Tue, 27 Jul 2021 11:05:53 +0800 Subject: [PATCH 08/45] =?UTF-8?q?7-20=20=E6=95=B0=E7=AE=A1=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/DataMenuController.java | 2 +- src/main/java/com/cetc32/dh/dto/DataMenuDTO.java | 12 ++++++++++++ .../cetc32/dh/service/impl/DataMenuServiceImpl.java | 1 + src/main/resources/mapper/DataMenuMapper.xml | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java index 68fef16..0f3855c 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java @@ -171,7 +171,7 @@ public class DataMenuController { // DataMenu dataMenu = dataMenuService.queryById(menuId); // dataMenu.setDiscription(discription); System.out.println(dataMenu.getDiscription()); - if(dataMenu!=null){ + if(dataMenu!=null&&dataMenu.getId()!=null){ if(dataMenuService.updatebyId(dataMenu)>0){ return ResponseResult.success(200,"更新成功","编目"+dataMenuService.queryById(dataMenu.getId()).getMenuName()+"更新成功！"); }else{ diff --git a/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java b/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java index 3110311..b4984c3 100644 --- a/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java +++ b/src/main/java/com/cetc32/dh/dto/DataMenuDTO.java @@ -55,6 +55,11 @@ public class DataMenuDTO implements Serializable { */ private Boolean addkids; + /** + * 菜单信息描述 + */ + private String discription; + /** * 子编目节点 @@ -212,4 +217,11 @@ public class DataMenuDTO implements Serializable { } + public String getDiscription() { + return discription; + } + + public void setDiscription(String discription) { + this.discription = discription; + } } diff --git a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java index 4927241..23a8c81 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java @@ -134,6 +134,7 @@ public class DataMenuServiceImpl implements DataMenuService { dataMenuDTO.setIcon(dataMenu.getIcon()); dataMenuDTO.setDisabled(dataMenu.getDisabled()); dataMenuDTO.setAddkids(dataMenu.getAddkids()); + dataMenuDTO.setDiscription(dataMenu.getDiscription()); List childList = queryByPIdSatisfyId(id); if (childList.size() == 0) { // dataMenuDTO.setChildren(null); diff --git a/src/main/resources/mapper/DataMenuMapper.xml b/src/main/resources/mapper/DataMenuMapper.xml index 062cda6..c6adc27 100644 --- a/src/main/resources/mapper/DataMenuMapper.xml +++ b/src/main/resources/mapper/DataMenuMapper.xml @@ -157,7 +157,7 @@ icon = #{icon,jdbcType=VARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id} + + -- Gitee From f4acdfb1c33323bdc526893a9f3396c70d1e44cc Mon Sep 17 00:00:00 2001 From: root <123> Date: Tue, 10 Aug 2021 12:19:58 +0800 Subject: [PATCH 10/45] =?UTF-8?q?8-7=20=E6=95=B0=E7=AE=A1=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/ProvinceGeomMapper.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/resources/mapper/ProvinceGeomMapper.xml b/src/main/resources/mapper/ProvinceGeomMapper.xml index ee46923..523f52c 100644 --- a/src/main/resources/mapper/ProvinceGeomMapper.xml +++ b/src/main/resources/mapper/ProvinceGeomMapper.xml @@ -26,6 +26,10 @@ geom, + + polygon_text, + + @@ -43,6 +47,10 @@ #{geom,jdbcType=OTHER}, + + #{polygonText,jdbcType=VARCHAR}, + + -- Gitee From 04e322319d4d915e6e7c024d316fda7a2e23ad8a Mon Sep 17 00:00:00 2001 From: root <123> Date: Wed, 11 Aug 2021 09:17:29 +0800 Subject: [PATCH 11/45] =?UTF-8?q?8-7=20=E6=95=B0=E7=AE=A1=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/ProvinceGeomController.java | 44 +++++++++---------- .../com/cetc32/dh/entity/ProvinceGeom.java | 12 +++++ src/main/resources/application-dev.yml | 4 +- .../resources/mapper/ProvinceGeomMapper.xml | 6 +++ 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 5eb76c0..2852322 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -1,23 +1,16 @@ package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.beans.LoginParameter; -import com.cetc32.dh.beans.LoginResult; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.DigestUtils; -import com.cetc32.dh.common.utils.JWTUtil; import com.cetc32.dh.entity.*; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.CityService; +import com.cetc32.dh.mybatis.CityMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.cetc32.dh.service.ProvinceGeomService; import com.cetc32.dh.mybatis.ProvinceMapper; - import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -30,6 +23,8 @@ public class ProvinceGeomController { ProvinceMapper provinceMapper; @Autowired ProvinceGeomService provinceGeomService; + @Autowired + CityMapper cityService; @PostMapping("/init") public ResponseData init(){ @@ -101,24 +96,25 @@ public class ProvinceGeomController { /* 判断点是否在面中 */ - @PostMapping("/pointandpolygon") - public ResponseResult pointAndPolygon() { - int count = 0; - String point ="POINT(2 2)"; + @GetMapping("/pointandpolygon") + public ResponseResult pointAndPolygon(String shape) { + Boolean judge = false; + shape="POINT(2 2)"; +// shape="POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; + List nameList = new ArrayList<>(); List provinceGeomList = provinceGeomService.selectAll(); for (ProvinceGeom provinceGeom : provinceGeomList) { - - - - - - - + if(provinceGeom.getPolygonText()!=null&&shape.contains("POINT")) { + judge = cityService.judgePointContain(shape, provinceGeom.getPolygonText());//不包含边界上的点 + } +// if(provinceGeom.getPolygonText()!=null&&shape.contains("POLYGON")) { +// judge = cityService.judgePolygonContain(provinceGeom.getPolygonText(),shape); +// } + if(judge){ + nameList.add(provinceGeom.getProvince()); + } } - - - return null; - + return ResponseResult.success(nameList); } diff --git a/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java b/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java index 8e0b999..c449412 100644 --- a/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java +++ b/src/main/java/com/cetc32/dh/entity/ProvinceGeom.java @@ -14,6 +14,18 @@ public class ProvinceGeom { private Object geom; + @Column(name = "polygon_text") + private String polygonText; + + public String getPolygonText() { + return polygonText; + } + + public void setPolygonText(String polygonText) { + this.polygonText = polygonText; + } + + /** * @return province */ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ec057b9..b0ad4ca 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -74,9 +74,9 @@ writePath: ${rootPath}/product flowPath: ${rootPath}/flowpath/ upDatePath: ${rootPath}/updatePath/ downPath: ${rootPath}/downPath -eip: http://192.168.1.209:8080/ +eip: http://192.168.1.42:8080/ sso: - authcenter: http://192.168.1.60:8087 + authcenter: http://192.168.1.42:8087 verifyUrl: ${sso.authcenter}/rest/auth/verify?token= passportUrl: ${sso.authcenter}/?ReturnUrl= defaultLoginRequiredEnable: true diff --git a/src/main/resources/mapper/ProvinceGeomMapper.xml b/src/main/resources/mapper/ProvinceGeomMapper.xml index 523f52c..efefc54 100644 --- a/src/main/resources/mapper/ProvinceGeomMapper.xml +++ b/src/main/resources/mapper/ProvinceGeomMapper.xml @@ -60,6 +60,12 @@ geom = ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326), + polygon_text = st_astext(ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326)), + + + + geom = ST_geomfromtext(#{polygonText,jdbcType=VARCHAR},4326), + polygon_text = #{polygonText,jdbcType=VARCHAR}, where province = #{province,jdbcType=VARCHAR} -- Gitee From 7f93a251384c5fc43fc1916988b402ab357f7ee2 Mon Sep 17 00:00:00 2001 From: root <123> Date: Wed, 11 Aug 2021 15:42:54 +0800 Subject: [PATCH 12/45] =?UTF-8?q?8-7=20=E6=95=B0=E7=AE=A1=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E7=82=B9=E7=BA=BF=E9=9D=A2=E5=9C=A8=E5=93=AA=E4=BA=9B?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/ProvinceGeomController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 2852322..f3df838 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -98,19 +98,20 @@ public class ProvinceGeomController { */ @GetMapping("/pointandpolygon") public ResponseResult pointAndPolygon(String shape) { - Boolean judge = false; + Boolean jdg_point = false; + Boolean jdg_polygon = false; + shape="POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; shape="POINT(2 2)"; -// shape="POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; List nameList = new ArrayList<>(); List provinceGeomList = provinceGeomService.selectAll(); for (ProvinceGeom provinceGeom : provinceGeomList) { if(provinceGeom.getPolygonText()!=null&&shape.contains("POINT")) { - judge = cityService.judgePointContain(shape, provinceGeom.getPolygonText());//不包含边界上的点 + jdg_point = cityService.judgePointContain(shape, provinceGeom.getPolygonText());//不包含边界上的点 } -// if(provinceGeom.getPolygonText()!=null&&shape.contains("POLYGON")) { -// judge = cityService.judgePolygonContain(provinceGeom.getPolygonText(),shape); -// } - if(judge){ + if(provinceGeom.getPolygonText()!=null&&shape.contains("POLYGON")) { + jdg_polygon = cityService.judgePolygonContain(provinceGeom.getPolygonText(),shape); + } + if(jdg_point||jdg_polygon){ nameList.add(provinceGeom.getProvince()); } } -- Gitee From ca59da107182f05f2322aa09c4f09a53709ef8f7 Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Fri, 13 Aug 2021 07:12:29 +0800 Subject: [PATCH 13/45] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/rest/DataFileController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index 32af8d4..ac6c51f 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -812,7 +812,8 @@ public class DataFileController { @ApiImplicitParam(name = "fileId", value = "文件id") public ResponseResult clearUpdateile(@RequestBody Map map) { Long fileId = Long.parseLong((String) map.get("fileId")); - String upCachePath = "/root/update" + "file" + fileId; + String upCachePath = upDatePath + "file" + fileId; + //String upCachePath = "/root/update" + "file" + fileId; System.out.println(upCachePath); FileUtil.deleteDir(upCachePath); File file = new File(upCachePath); @@ -921,9 +922,9 @@ public class DataFileController { File updateCache = new File(updateCachePath); if (updateCache.exists()) { File[] files = updateCache.listFiles(); - if (files.length > 1) { - return ResponseResult.error("上传文件或文件夹只允许一个,上传个数超出范围，请点击清空更新缓存后再上传！"); - } +// if (files.length > 1) { +// return ResponseResult.error("上传文件或文件夹只允许一个,上传个数超出范围，请点击清空更新缓存后再上传！"); +// } } if (updateCache.exists() && flag == true) { if (updateCache.listFiles().length == 1) { -- Gitee From 00cc5e0aac72e6b672f8a2686836583c3d50a918 Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 13 Aug 2021 10:50:36 +0800 Subject: [PATCH 14/45] =?UTF-8?q?8-13=20=E5=87=BA=E6=89=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/DataFileController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index 32af8d4..d97c3b7 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -583,6 +583,7 @@ public class DataFileController { @ApiImplicitParams({ @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"), }) + @LoginSkipped @GetMapping("/downloadMulFile") public String downloadMulFile(String[] fileIds, HttpServletResponse response) { @@ -812,7 +813,7 @@ public class DataFileController { @ApiImplicitParam(name = "fileId", value = "文件id") public ResponseResult clearUpdateile(@RequestBody Map map) { Long fileId = Long.parseLong((String) map.get("fileId")); - String upCachePath = "/root/update" + "file" + fileId; + String upCachePath = upDatePath + "file" + fileId; System.out.println(upCachePath); FileUtil.deleteDir(upCachePath); File file = new File(upCachePath); @@ -877,6 +878,7 @@ public class DataFileController { String fileConfig = (String) map.get("fileConfig"); String scale = (String) map.get("scale"); String region = null; + String new_path = null; if ((List) map.get("regionList") != null) { region = ((List) map.get("regionList")).toString(); region = region.replace("[", ""); @@ -932,6 +934,7 @@ public class DataFileController { String path_whole = dataFile.getFilePath(); String path = path_whole.substring(0, path_whole.lastIndexOf("/")); if (files[0].getName().contains(".")) { + new_path = path + File.separator + files[0].getName(); flag = files[0].renameTo(new File(path + File.separator + files[0].getName())); } else { //文件加上时间戳 @@ -949,7 +952,8 @@ public class DataFileController { } dataFile.setFilePath(path + File.separator + dataFile.getFileName()); if (files[0].getName().contains(".")) { - dataFile.setFileSize(files[0].length()); + File f = new File(path + File.separator + files[0].getName()); + dataFile.setFileSize(f.length()); dataFile.setFileNumbers(1); } else { dataFile.setFileSize(FileUtils.sizeOfDirectory(new File(dataFile.getFilePath()))); @@ -957,7 +961,9 @@ public class DataFileController { } } - FileUtil.deleteDir(old_filePath); + if(!old_filePath.equals(new_path)){ + FileUtil.deleteDir(old_filePath); + } FileUtil.deleteDir(updateCachePath); } } -- Gitee From 4bf1fe9c684350a6dc5e1a84049b894e36c77d11 Mon Sep 17 00:00:00 2001 From: root <123> Date: Mon, 16 Aug 2021 14:02:57 +0800 Subject: [PATCH 15/45] =?UTF-8?q?8-16=20=E5=87=BA=E6=89=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 1bfcf7f..0ce23a8 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -43,8 +43,8 @@ spring: servlet: multipart: - max-file-size: 5GB - max-request-size: 5GB + max-file-size: 2GB + max-request-size: 2GB #设置静态资源路径，多个以逗号分隔 resources: -- Gitee From 609f2841406e04bc99934fc78024d37c0aa66a6a Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Tue, 17 Aug 2021 08:42:36 +0800 Subject: [PATCH 16/45] =?UTF-8?q?=E5=87=BA=E6=89=80=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/rest/DataFileController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index ac6c51f..4c06ae3 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -922,9 +922,9 @@ public class DataFileController { File updateCache = new File(updateCachePath); if (updateCache.exists()) { File[] files = updateCache.listFiles(); -// if (files.length > 1) { -// return ResponseResult.error("上传文件或文件夹只允许一个,上传个数超出范围，请点击清空更新缓存后再上传！"); -// } + if (files.length > 1) { + return ResponseResult.error("上传文件或文件夹只允许一个,上传个数超出范围，请点击清空更新缓存后再上传！"); + } } if (updateCache.exists() && flag == true) { if (updateCache.listFiles().length == 1) { @@ -950,7 +950,9 @@ public class DataFileController { } dataFile.setFilePath(path + File.separator + dataFile.getFileName()); if (files[0].getName().contains(".")) { - dataFile.setFileSize(files[0].length()); +// dataFile.setFileSize(files[0].length()); + File f = new File(path + File.separator + files[0].getName()); + dataFile.setFileSize(f.length()); dataFile.setFileNumbers(1); } else { dataFile.setFileSize(FileUtils.sizeOfDirectory(new File(dataFile.getFilePath()))); -- Gitee From 6045c3ec5ca057423998fde375f8a78610a47208 Mon Sep 17 00:00:00 2001 From: root <123> Date: Tue, 17 Aug 2021 09:01:42 +0800 Subject: [PATCH 17/45] =?UTF-8?q?8-17=20=E5=87=BA=E6=89=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/DataFileController.java | 12 +++++++++--- src/main/resources/application-dev.yml | 6 ++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index 32af8d4..fc1ddaa 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -64,6 +64,8 @@ public class DataFileController { String upDatePath; @Value("${downPath}") String downPath; + @Value("${storePath}") + String storePath; @Value("${server.port}") private String port; @@ -412,7 +414,7 @@ public class DataFileController { dataFile.setSubmitor(SecurityUserUtil.getUser().getUsername()); DataFile dataFile_new = dataFile; DataFile dataFile_new2 = dataFile; - String path_move = dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl(); + String path_move = storePath + File.separator+dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl(); FileUtil.makeDir(path_move); File baseFile = new File(upCachePath); if (baseFile == null) { @@ -447,7 +449,7 @@ public class DataFileController { } } dataFile.setFileName(fileName); - String path = dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl() + File.separator + fileName; + String path = storePath+dataMenuService.queryById(dataFile.getMenuId().longValue()).getUrl() + File.separator + fileName; dataFile.setFilePath(path); dataFile_new = dataFile; if (dataFileService.insertDataFile(dataFile_new) >= 0) { @@ -583,9 +585,11 @@ public class DataFileController { @ApiImplicitParams({ @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"), }) + @LoginSkipped @GetMapping("/downloadMulFile") public String downloadMulFile(String[] fileIds, HttpServletResponse response) { + if (fileIds.length == 1) { Long fileId = Long.parseLong(fileIds[0]); System.out.println("文件号！！！！" + fileId); @@ -597,6 +601,7 @@ public class DataFileController { String filePath = dataFileService.queryById(fileId).getFilePath(); filePath = filePath.replace("\\", File.separator); filePath = filePath.replace("/", File.separator); + filePath = storePath + File.separator + filePath; if (!FileUtil.isDirectory(filePath)) { FileUtil.downloadFile(response, fileName, filePath); } @@ -812,7 +817,7 @@ public class DataFileController { @ApiImplicitParam(name = "fileId", value = "文件id") public ResponseResult clearUpdateile(@RequestBody Map map) { Long fileId = Long.parseLong((String) map.get("fileId")); - String upCachePath = "/root/update" + "file" + fileId; + String upCachePath = upDatePath + "file" + fileId; System.out.println(upCachePath); FileUtil.deleteDir(upCachePath); File file = new File(upCachePath); @@ -957,6 +962,7 @@ public class DataFileController { } } + FileUtil.deleteDir(old_filePath); FileUtil.deleteDir(updateCachePath); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b0ad4ca..a0782a2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -65,8 +65,10 @@ logging: level: com.cetc32.dh.mybatis: debug -storePath: /root/ -upLoadPath: ${storePath}upLoad +basicPath: /root/ +storePath: /root/导航 +upLoadPath: ${basicPath}upLoad + rootPath: /root/daohang/data myPath: ${rootPath}myPath -- Gitee From 7abc275b02abd07b8b6125d8c6cde3f55358f33f Mon Sep 17 00:00:00 2001 From: root <123> Date: Mon, 23 Aug 2021 13:18:10 +0800 Subject: [PATCH 18/45] =?UTF-8?q?8-17=20=E5=87=BA=E6=89=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/rest/DataFileController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index fc1ddaa..758c484 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -882,6 +882,7 @@ public class DataFileController { String fileConfig = (String) map.get("fileConfig"); String scale = (String) map.get("scale"); String region = null; + String new_path = null; if ((List) map.get("regionList") != null) { region = ((List) map.get("regionList")).toString(); region = region.replace("[", ""); @@ -937,6 +938,7 @@ public class DataFileController { String path_whole = dataFile.getFilePath(); String path = path_whole.substring(0, path_whole.lastIndexOf("/")); if (files[0].getName().contains(".")) { + new_path = path + File.separator + files[0].getName(); flag = files[0].renameTo(new File(path + File.separator + files[0].getName())); } else { //文件加上时间戳 @@ -954,7 +956,8 @@ public class DataFileController { } dataFile.setFilePath(path + File.separator + dataFile.getFileName()); if (files[0].getName().contains(".")) { - dataFile.setFileSize(files[0].length()); + File f = new File(path + File.separator + files[0].getName()); + dataFile.setFileSize(f.length()); dataFile.setFileNumbers(1); } else { dataFile.setFileSize(FileUtils.sizeOfDirectory(new File(dataFile.getFilePath()))); @@ -962,8 +965,9 @@ public class DataFileController { } } - - FileUtil.deleteDir(old_filePath); + if(!old_filePath.equals(new_path)){ + FileUtil.deleteDir(old_filePath); + } FileUtil.deleteDir(updateCachePath); } } @@ -974,7 +978,6 @@ public class DataFileController { } - /** * 统计编目menuId下的所有文件数据的大小 * -- Gitee From b0bd5a6cb64a68f09ead252a2b9d3cd31779a7af Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 27 Aug 2021 15:57:43 +0800 Subject: [PATCH 19/45] =?UTF-8?q?2021=E5=B9=B48=E6=9C=8827=20=20=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/ProvinceGeomController.java | 83 +++++++++++++------ .../com/cetc32/dh/mybatis/DataFileMapper.java | 8 ++ .../cetc32/dh/mybatis/ProvinceGeomMapper.java | 4 + .../cetc32/dh/service/DataFileService.java | 9 ++ .../dh/service/ProvinceGeomService.java | 3 + .../dh/service/impl/DataFileServiceImpl.java | 12 +++ .../service/impl/ProvinceGeomServiceImpl.java | 6 ++ src/main/resources/mapper/DataFileMapper.xml | 5 ++ .../resources/mapper/ProvinceGeomMapper.xml | 22 +++-- 9 files changed, 119 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index f3df838..427ab58 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -2,19 +2,18 @@ package com.cetc32.dh.controller.rest; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.*; +import com.cetc32.dh.entity.DataFile; +import com.cetc32.dh.entity.Province; +import com.cetc32.dh.entity.ProvinceGeom; import com.cetc32.dh.mybatis.CityMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.cetc32.dh.service.ProvinceGeomService; import com.cetc32.dh.mybatis.ProvinceMapper; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; +import com.cetc32.dh.service.DataFileService; +import com.cetc32.dh.service.ProvinceGeomService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; @RestController @RequestMapping("/rest/progeom/") @@ -25,19 +24,21 @@ public class ProvinceGeomController { ProvinceGeomService provinceGeomService; @Autowired CityMapper cityService; + @Autowired + DataFileService dataFileService; @PostMapping("/init") - public ResponseData init(){ + public ResponseData init() { List provinceList = provinceMapper.selectByDistinct(); ProvinceGeom provinceGeom = new ProvinceGeom(); - int data=0; - for (Province province:provinceList) { + int data = 0; + for (Province province : provinceList) { provinceGeom.setProvince(province.getProvince()); provinceGeom.setProvinceCode(province.getProvinceCode()); provinceGeomService.insertOne(provinceGeom); data++; } - return ResponseData.success(200,"success",data); + return ResponseData.success(200, "success", data); } /*将点连接成面*/ @@ -94,33 +95,63 @@ public class ProvinceGeomController { /* - 判断点是否在面中 + 判断输入的点或者面在哪些区域中包含，返回区域的名称 */ @GetMapping("/pointandpolygon") public ResponseResult pointAndPolygon(String shape) { Boolean jdg_point = false; Boolean jdg_polygon = false; - shape="POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; - shape="POINT(2 2)"; + shape = "POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; + shape = "POINT(2 2)"; List nameList = new ArrayList<>(); List provinceGeomList = provinceGeomService.selectAll(); for (ProvinceGeom provinceGeom : provinceGeomList) { - if(provinceGeom.getPolygonText()!=null&&shape.contains("POINT")) { + if (provinceGeom.getPolygonText() != null && shape.contains("POINT")) { jdg_point = cityService.judgePointContain(shape, provinceGeom.getPolygonText());//不包含边界上的点 } - if(provinceGeom.getPolygonText()!=null&&shape.contains("POLYGON")) { - jdg_polygon = cityService.judgePolygonContain(provinceGeom.getPolygonText(),shape); + if (provinceGeom.getPolygonText() != null && shape.contains("POLYGON")) { + jdg_polygon = cityService.judgePolygonContain(provinceGeom.getPolygonText(), shape); } - if(jdg_point||jdg_polygon){ + if (jdg_point || jdg_polygon) { nameList.add(provinceGeom.getProvince()); } } - return ResponseResult.success(nameList); + return ResponseResult.success(nameList); } - - - + /* + 根据区域和目录id进行搜索，判断哪些记录范围和输入区域有交际 + */ + @PostMapping("/menuandpolygon") + public ResponseResult menuAndPolygon(@RequestBody Map map) { + Integer menuId = (Integer)map.get("menuId"); + String shape = (String)map.get("shape"); + Boolean jdg_polygon = true; + ProvinceGeom provinceGeom; +// shape = "POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; + List resultFileList = new ArrayList<>(); + List regionList = new ArrayList<>(); + List dataFileList = new ArrayList<>(); + dataFileList = dataFileService.queryByMenuId(menuId); + for (int i = 0; i < dataFileList.size(); i++) { + jdg_polygon = true; + if (dataFileList.get(i).getRegion() != null && !dataFileList.get(i).getRegion().trim().isEmpty()) { + regionList = Arrays.asList(dataFileList.get(i).getRegion().split(",")); + for (int j = 0; j < regionList.size(); j++) { + System.out.println(regionList.get(j)); + provinceGeom = provinceGeomService.queryByName(StringUtils.trim(regionList.get(j))); + if (provinceGeom != null && provinceGeom.getPolygonText() != null && shape.contains("POLYGON")) { + jdg_polygon = provinceGeomService.judgePolygonDisjoint(provinceGeom.getPolygonText(), shape); + if (!jdg_polygon) { + resultFileList.add(dataFileList.get(i)); + break; + } + } + } + } + } + return ResponseResult.success(resultFileList); + } } diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java index 2f35496..09b4532 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java @@ -138,6 +138,14 @@ public interface DataFileMapper extends Mapper { */ public Integer deleteByMenuId(Integer menuId); + /** + * 查询编目menuId下的所有文件数据 + * + * @param menuId 编目id + * @return 返回查询结果 + */ + public List queryByMenuId(Integer menuId); + /** * 统计编目menuId下的所有文件数据的大小 * diff --git a/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java index 04538f6..8535a69 100644 --- a/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java @@ -2,6 +2,7 @@ package com.cetc32.dh.mybatis; import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.ProvinceGeom; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import tk.mybatis.mapper.common.Mapper; @@ -12,6 +13,9 @@ public interface ProvinceGeomMapper extends Mapper { public int insertOne(ProvinceGeom provinceGeom); public int updateByName(ProvinceGeom provinceGeom); public List selectAll(); + public ProvinceGeom queryByName(String name); + public Boolean judgePolygonDisjoint(@Param("polygon1") String polygon1, @Param("polygon2") String polygon2); + } diff --git a/src/main/java/com/cetc32/dh/service/DataFileService.java b/src/main/java/com/cetc32/dh/service/DataFileService.java index 4f38746..6e4f796 100644 --- a/src/main/java/com/cetc32/dh/service/DataFileService.java +++ b/src/main/java/com/cetc32/dh/service/DataFileService.java @@ -127,6 +127,15 @@ public interface DataFileService { */ public Integer deleteByMenuId(Integer menuId); + + /** + * 查询编目menuId下的所有文件数据 + * + * @param menuId 编目id + * @return 返回查询结果 + */ + public List queryByMenuId(Integer menuId); + /** * 统计编目menuId下的所有文件数据的大小 * diff --git a/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java b/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java index 03ede22..a001a0d 100644 --- a/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java +++ b/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java @@ -1,6 +1,7 @@ package com.cetc32.dh.service; import com.cetc32.dh.entity.ProvinceGeom; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -10,4 +11,6 @@ public interface ProvinceGeomService { public int insertOne(ProvinceGeom provinceGeom); public int updateByName(ProvinceGeom provinceGeom); public List selectAll(); + public ProvinceGeom queryByName(String name); + public Boolean judgePolygonDisjoint(String polygon1,String polygon2); } diff --git a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java index 832cf70..22b5832 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java @@ -170,6 +170,18 @@ public class DataFileServiceImpl implements DataFileService { return dataFileMapper.deleteByMenuId(menuId); } + + /** + * 查询编目menuId下的所有文件数据 + * + * @param menuId 编目id + * @return 返回查询结果 + */ + @Override + public List queryByMenuId(Integer menuId){ + return dataFileMapper.queryByMenuId(menuId); + } + /** * 根据安全状态和用户统计文件数据 * diff --git a/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java index 9facd9d..fab76b2 100644 --- a/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java @@ -23,4 +23,10 @@ public class ProvinceGeomServiceImpl implements ProvinceGeomService{ } public List selectAll(){return provinceGeomMapper.selectAll();} + + public ProvinceGeom queryByName(String name){return provinceGeomMapper.queryByName(name);} + + public Boolean judgePolygonDisjoint(String polygon1,String polygon2){ + return provinceGeomMapper.judgePolygonDisjoint(polygon1,polygon2); + } } diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml index cd42158..0a0e971 100644 --- a/src/main/resources/mapper/DataFileMapper.xml +++ b/src/main/resources/mapper/DataFileMapper.xml @@ -412,6 +412,11 @@ where id= #{id,jdbcType=BIGINT} + + delete from data_file where id = #{id,jdbcType=BIGINT} diff --git a/src/main/resources/mapper/ProvinceGeomMapper.xml b/src/main/resources/mapper/ProvinceGeomMapper.xml index efefc54..04079a2 100644 --- a/src/main/resources/mapper/ProvinceGeomMapper.xml +++ b/src/main/resources/mapper/ProvinceGeomMapper.xml @@ -1,16 +1,16 @@ - - + + - - - - + + + + - + insert into province_geom @@ -76,6 +76,14 @@ + + + -- Gitee From 911977e58b8d553a4c13eb5ee00195731be93087 Mon Sep 17 00:00:00 2001 From: root <393696201@qq.com> Date: Tue, 31 Aug 2021 09:32:14 +0800 Subject: [PATCH 20/45] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/DemanSubmitController.java | 18 +++++++- .../rest/ProductDemandController.java | 8 ++-- .../com/cetc32/dh/entity/DemandSubmit.java | 10 +++++ .../com/cetc32/dh/entity/EstimateTask.java | 10 +++++ .../com/cetc32/dh/entity/Productdemand.java | 40 +++++++++++++++++ .../cetc32/dh/mybatis/DemandSubmitMapper.java | 2 + .../dh/service/DemandSubmitService.java | 2 + .../impl/DemandSubmitServiceImppl.java | 5 +++ .../resources/mapper/DemandSubmitMapper.xml | 16 +++++++ .../resources/mapper/EstimateTaskMapper.xml | 12 ++++- .../resources/mapper/ProductdemandMapper.xml | 45 +++++++++++++++++-- 11 files changed, 159 insertions(+), 9 deletions(-) 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 080c954..5584323 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -156,7 +156,7 @@ public class DemanSubmitController { DemandSubmit demandSubmit = new DemandSubmit(); BeanUtils.copyProperties(demandDTO,demandSubmit); Integer userid = SecurityUserUtil.getUser().getId(); - if(demandSubmit.getProjectName() == null || demandSubmit.getDemandName()==null||demandSubmit.getDemandClassify()==null + if(demandSubmit.getDemandName()==null||demandSubmit.getDemandClassify()==null ||demandSubmit.getGetEndtimeFront()==null){ return ResponseResult.error("传入空值！"); } @@ -420,6 +420,7 @@ public class DemanSubmitController { List ids = new ArrayList<>(); ids = (List) map.get("ids"); DemandSubmit demandSubmit = new DemandSubmit(); + String reason=(String) map.get("reason"); String staus = "审批通过"; String userName = SecurityUserUtil.getUser().getUsername(); int sum = 0; @@ -427,6 +428,7 @@ public class DemanSubmitController { Integer id = ids.get(i); demandSubmit = demandSubmitService.selectByPrimaryKey(id); demandSubmit.setApprover(userName); + demandSubmit.setReason(reason); Date appt = new Date(); demandSubmit.setApproceTime(appt); demandSubmit.setStatus(staus); @@ -453,6 +455,7 @@ public class DemanSubmitController { List ids = new ArrayList<>(); ids = (List) map.get("ids"); DemandSubmit demandSubmit = new DemandSubmit(); + String reason=(String) map.get("reason"); String userName = SecurityUserUtil.getUser().getUsername(); String staus = "审批拒绝"; int sum = 0; @@ -460,6 +463,7 @@ public class DemanSubmitController { Integer id = ids.get(i); demandSubmit = demandSubmitService.selectByPrimaryKey(id); demandSubmit.setApprover(userName); + demandSubmit.setReason(reason); Date appt = new Date(); demandSubmit.setApproceTime(appt); demandSubmit.setStatus(staus); @@ -524,4 +528,16 @@ public class DemanSubmitController { return new PageDataResult(count,demandSubmitDTOS,page * results); } } + + @ApiOperation(value = "获取所有的分类") + @PostMapping("/getclassify") + public List getAllclassify(){ + List results = new ArrayList<>(); + results.add("全部分类"); + List getclassify = demandSubmitService.alldemandclassify(); + for (int i = 0;i queryFilesByObj(vDemand vdemand); List searchbystatus(DemandSubmitDTO demandSubmitDTO); + + List alldemandclassify(); } \ 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 4b9cb47..c181d61 100644 --- a/src/main/java/com/cetc32/dh/service/DemandSubmitService.java +++ b/src/main/java/com/cetc32/dh/service/DemandSubmitService.java @@ -62,4 +62,6 @@ public interface DemandSubmitService { List queryFilesByObj(vDemand vdemand); List searchbystatus(DemandSubmitDTO demandSubmitDTO); + + List alldemandclassify(); } 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 010dc01..f097602 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java @@ -139,4 +139,9 @@ public class DemandSubmitServiceImppl implements DemandSubmitService { public List searchbystatus(DemandSubmitDTO demandSubmitDTO){ return demandSubmitMapper.searchbystatus(demandSubmitDTO); } + + @Override + public List alldemandclassify(){ + return demandSubmitMapper.alldemandclassify(); + } } diff --git a/src/main/resources/mapper/DemandSubmitMapper.xml b/src/main/resources/mapper/DemandSubmitMapper.xml index 79f4a21..78001a2 100644 --- a/src/main/resources/mapper/DemandSubmitMapper.xml +++ b/src/main/resources/mapper/DemandSubmitMapper.xml @@ -18,6 +18,7 @@ + @@ -118,6 +119,9 @@ areaname, + + reason, + @@ -168,6 +172,9 @@ #{areaname,jdbcType=VARCHAR}, + + #{reason,jdbcType=VARCHAR}, + @@ -218,6 +225,9 @@ areaname=#{areaname,jdbcType=VARCHAR}, + + reason=#{reason,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} @@ -336,4 +346,10 @@ from demand_submit where status=#{demandStatus} + + diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml index dd28fc0..56a8899 100644 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ b/src/main/resources/mapper/EstimateTaskMapper.xml @@ -15,10 +15,11 @@ + id, name, task_classify, task_type, task_path, starttime, endtime, creator, creattime, - status,approver,demandid,approvtime + status,approver,demandid,approvtime,reason select * from productdemand @@ -34,7 +38,7 @@ @@ -106,7 +110,19 @@ approvtime, - area + area, + + + reason, + + + tasknum, + + + taskdetail, + + + changetime, @@ -155,7 +171,20 @@ #{area,jdbcType=VARCHAR}, + + #{reason,jdbcType=VARCHAR}, + + + #{tasknum,jdbcType=VARCHAR}, + + + #{taskdetail,jdbcType=VARCHAR}, + + + now(), + + update productdemand @@ -202,6 +231,16 @@ area = #{area,jdbcType=VARCHAR}, + + reason=#{reason,jdbcType=VARCHAR}, + + changetime=now(), + + tasknum=#{tasknum,jdbcType=VARCHAR}, + + + taskdetail=#{taskdetail,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} -- Gitee From 26a0980361ea71c66123e45dca2f86c088853366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Tue, 31 Aug 2021 14:33:15 +0800 Subject: [PATCH 21/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + .../rest/OtherInterfaceController.java | 186 ++++++++++++++---- .../java/com/cetc32/dh/entity/DataPlp.java | 53 ++++- .../com/cetc32/dh/entity/DataPlpCollect.java | 32 +++ src/main/resources/application-xwy.yml | 2 +- src/main/resources/mapper/DataPlpMapper.xml | 51 +++-- 6 files changed, 264 insertions(+), 66 deletions(-) create mode 100644 src/main/java/com/cetc32/dh/entity/DataPlpCollect.java diff --git a/pom.xml b/pom.xml index 6d3732c..4acb484 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ provided + + + commons-io + commons-io + 2.11.0 + 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 5f18de4..2a76ca4 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -10,13 +10,21 @@ import com.cetc32.dh.entity.*; import com.cetc32.dh.service.*; import com.cetc32.dh.service.AdminUserService; +import com.cetc32.dh.utils.FileUtil; +import com.cetc32.webutil.common.annotations.LoginSkipped; import com.cetc32.webutil.common.util.SecurityUserUtil; +import com.mysql.cj.util.Base64Decoder; import io.swagger.annotations.ApiOperation; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import tk.mybatis.mapper.util.StringUtil; +import java.io.File; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -55,7 +63,7 @@ public class OtherInterfaceController { @ApiOperation(value = "生产业务需求上报") @PostMapping("/req/submit") - public ResponseData reqSubmit(ReqSubmit req) + public ResponseData reqSubmit(ReqSubmit req, MultipartFile[] file) { DemandSubmit submit=new DemandSubmit(); submit.setProjectName(req.getProject()); @@ -68,25 +76,14 @@ public class OtherInterfaceController { submit.setDemandAttachment(null); Date create = new Date(); submit.setCreattime(create); - /*String file=req.getFile(); - - if(!file.isEmpty()) - { - String upCachePath=upLoadPath+"_req_submit_"+req.getUsername(); - String randomStr = UUID.randomUUID().toString(); - String oldFileName = file.getOriginalFilename(); - String newFileName = randomStr + oldFileName.substring(oldFileName.lastIndexOf(".")); - File nfile = new File(upCachePath,newFileName); - if(!nfile.getParentFile().exists()){ - nfile.getParentFile().mkdirs(); - } - try { - file.transferTo(nfile); - submit.setDemandAttachment(nfile.getAbsolutePath()); - } catch (IOException e) { - return ResponseData.error("上报失败"); - } - }*/ + if(null != file){ + String upCachePath = upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis(); + String filepath = upCachePath; + String result = FileUtil.uploadFile(file, filepath); + if (result.contains("上传失败")) + return ResponseData.error(result); + submit.setDemandAttachment(filepath); + } if(demandSubmitService.insertSelective(submit)>0) { return ResponseData.success("上报成功"); @@ -159,11 +156,25 @@ public class OtherInterfaceController { Integer taskid=req.get("taskid")==null?null:Integer.parseInt(req.get("taskid")) ; String status=req.get("status"); + String report =req.get("report"); if(taskid!=null && status!=null) { EstimateTask submit=estimateTaskService.selectByPrimaryKey(taskid); if(submit!=null) { + if(null !=report){ + if(StringUtils.isBlank(submit.getTaskPath())){ + submit.setTaskPath(upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis()); + } + saveBase64File(submit.getTaskPath(),0,0,report.split("base64,"),"EstimateReports"); + /*String upCachePath = upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis(); + String filepath = upCachePath; + String result = FileUtil.uploadFile(file, filepath); + if (result.contains("上传失败")) + return ResponseData.error(result); + submit.setTaskPath(filepath);*/ + } + submit.setStatus(status); if(estimateTaskService.updateByPrimaryKeySelective(submit)>0) { @@ -251,37 +262,130 @@ public class OtherInterfaceController { @ApiOperation(value = "采集数据上报") @PostMapping("/import/collection") - public ResponseData DataCollection(@RequestBody DataCollected data) { - if(data.getEventtype()==null) - { - - String p=data.getPoints(); - if(null == p){ + @LoginSkipped + public ResponseData DataCollection(@RequestBody DataPlpCollect data) { + if(data.getEventType()==null + && verifyEnventType(data)) { return ResponseData.error("无法识别的数据类型"); + } + if(data.getDataType() !=null){ + switch ( data.getDataType()){ + case "120400":case "120500":case "120600":case "120700": + case "130200":case "140200":case "260100":case "270100": + case "140502":case "270201":case "140508":case "140510": + case "140513": /// poionts + case "120800":case "140100":case "140300":case "140516": + case "140523":case "160200":// lines + case "160400":case "161103":case "220100":case "220200"://ployons + break; + default:return ResponseData.error("数据类型不在已知范围内"); } - p= p.toUpperCase(); - if(p.startsWith("POINT")) - { - data.setEventtype("POINT".toLowerCase()); - } - if(p.startsWith("LINESTRING")) - { - data.setEventtype("LINESTRING".toLowerCase()); + } + data.setSubmitor(SecurityUserUtil.getUser().getUsername()); + String msg="操作成功!"; + String filePath = upLoadPath + File.separator+"collect"+File.separator+SecurityUserUtil.getUser().getId() + +File.separator+System.currentTimeMillis() ; + if(null != data.getPhoto()){ + String[] base64Data = data.getPhoto(); + + int errFiles=0; + for(int i =0;i 0) + msg += errFiles +" 个图片文件出错！"; + data.setFileName(filePath); + } + if(null != data.getScreenshot()){ + String[] base64Data = data.getScreenshot(); + int errFiles=0; + for(int i =0;i 0) + msg += errFiles +" 个截图文件出错！"; + data.setFileName(filePath); } - data.setSubmitor(SecurityUserUtil.getUser().getUsername()); - - if(dataPlpService.insertCollected(data)>0) + data.setStatus("未审批"); + if(dataPlpService.insertOne(data)>0) { - return ResponseData.success(); + return ResponseData.success(msg); } return ResponseData.error("上报失败！"); } + + private int saveBase64File(String filePath, int errFiles, int i, String[] d,String inffix) { + String dataPrix; + String datab; + if(d != null && d.length == 2){ + dataPrix = d[0]; + datab = d[1]; + }else{ + errFiles++; + return errFiles; + // return ResponseData.error("数据不合法"); + } + + String suffix = ""; + if("data:image/jpeg;".equalsIgnoreCase(dataPrix)){//data:image/jpeg;base64,base64编码的jpeg图片数据 + suffix = ".jpg"; + } else if("data:image/x-icon;".equalsIgnoreCase(dataPrix)){//data:image/x-icon;base64,base64编码的icon图片数据 + suffix = ".ico"; + } else if("data:image/gif;".equalsIgnoreCase(dataPrix)){//data:image/gif;base64,base64编码的gif图片数据 + suffix = ".gif"; + } else if("data:image/png;".equalsIgnoreCase(dataPrix)){//data:image/png;base64,base64编码的png图片数据 + suffix = ".png"; + } else if("data:file/zip;".equalsIgnoreCase(dataPrix)){//data:image/png;base64,base64编码的png图片数据 + suffix = ".zip"; + }else{ + errFiles++; + return errFiles; + //return ResponseData.error("上传图片格式不合法"); + } + //重命名文件名称 + String tempFileName = filePath + File.separator+inffix+"_" +i+ suffix; + + //因为BASE64Decoder的jar问题，此处使用spring框架提供的工具包 + Base64Decoder decoder = new Base64Decoder(); + byte[] bs = decoder.decode(datab.getBytes(),0, datab.length()); //将base64转换成字节流 + try{ + //使用apache提供的工具类操作流 + FileUtils.writeByteArrayToFile(new File(tempFileName), bs); + }catch(Exception ee){ + errFiles++; + //return ResponseData.error("上传失败，写入文件失败，"+ee.getMessage()); + } + return errFiles; + } + + private boolean verifyEnventType( DataPlpCollect data) { + String p=data.getPoints(); + if(null == p){ + return true; + } + p= p.toUpperCase(); + if(p.startsWith("POINT")) + { + data.setEventType("8"); + } + if(p.startsWith("LINESTRING")) + { + data.setEventType("64");; + } + if(p.startsWith("POLYGON")) + { + data.setEventType("128"); + } + return false; + } + @ApiOperation(value = "离线数据上报") @PostMapping("/import/offlinedata") public ResponseData offlineData(@RequestBody DhOflineData data) { diff --git a/src/main/java/com/cetc32/dh/entity/DataPlp.java b/src/main/java/com/cetc32/dh/entity/DataPlp.java index 3f54b50..c6213f9 100644 --- a/src/main/java/com/cetc32/dh/entity/DataPlp.java +++ b/src/main/java/com/cetc32/dh/entity/DataPlp.java @@ -63,7 +63,7 @@ public class DataPlp extends NumberS { /** * 预留字段2 */ - private String reserver2; + private String cityName; /** * 唯一标识 @@ -146,6 +146,36 @@ public class DataPlp extends NumberS { */ private String td_end; + /***/ + private String eventName; + private String operateState; + + private String dataType; + + public String getEventName() { + return eventName; + } + + public void setEventName(String eventName) { + this.eventName = eventName; + } + + public String getOperateState() { + return operateState; + } + + public void setOperateState(String operateType) { + this.operateState = operateType; + } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } +; /** * 无参构造函数 */ @@ -166,7 +196,7 @@ public class DataPlp extends NumberS { * @param points * @param approver * @param menuId - * @param reserver2 + * @param cityName * @param userId * @param security * @param description @@ -174,7 +204,7 @@ public class DataPlp extends NumberS { */ public DataPlp(Integer id, String fileName, String eventType, Integer security, Date createTime, String region, String fileTime, String description, Integer userId, String approver, String status, String fileConfig, Date approveTime, - String points, Integer menuId, String reserver2, byte[] photoByte, String submitor, String[] timeRange, String td_start, String td_end) { + String points, Integer menuId, String cityName, byte[] photoByte, String submitor, String[] timeRange, String td_start, String td_end) { this.id = id; this.fileName = fileName; this.eventType = eventType; @@ -191,7 +221,7 @@ public class DataPlp extends NumberS { this.photoByte = photoByte; this.points = points; this.menuId = menuId; - this.reserver2 = reserver2; + this.cityName = cityName; this.submitor = submitor; this.timeRange = timeRange; this.td_end = td_end; @@ -396,6 +426,9 @@ public class DataPlp extends NumberS { this.description = description == null ? null : description.trim(); } + public void setDescribe(String dse){ + this.description =dse; + } /** * 编目id * @@ -417,19 +450,19 @@ public class DataPlp extends NumberS { /** * 获取预留字段2 * - * @return reserver2 - 预留字段2 + * @return cityName - 预留字段2 */ - public String getReserver2() { - return reserver2; + public String getCityName() { + return cityName; } /** * 设置预留字段2 * - * @param reserver2 预留字段2 + * @param cityName 预留字段2 */ - public void setReserver2(String reserver2) { - this.reserver2 = reserver2 == null ? null : reserver2.trim(); + public void setCityName(String cityName) { + this.cityName = cityName == null ? null : cityName.trim(); } /** diff --git a/src/main/java/com/cetc32/dh/entity/DataPlpCollect.java b/src/main/java/com/cetc32/dh/entity/DataPlpCollect.java new file mode 100644 index 0000000..1f46260 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/DataPlpCollect.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/8/25 下午3:46 + ******************************************************************************/ +package com.cetc32.dh.entity; + +public class DataPlpCollect extends DataPlp{ + String screenshot[]; + String photos[]; + + public String[] getScreenshot() { + return screenshot; + } + + public void setScreenshot(String... screenshot) { + if(null == screenshot || screenshot.length ==0) + this.screenshot = null; + this.screenshot = screenshot; + } + + public String[] getPhoto() { + return photos; + } + + public void setPhoto(String... photos) { + if( photos ==null || photos.length==0) this.photos=null; + else this.photos = photos; + } +} diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index d4770b9..784527f 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -1,5 +1,5 @@ server: - port: 8192 + port: 8082 server.connectionTimeout: 18000000 diff --git a/src/main/resources/mapper/DataPlpMapper.xml b/src/main/resources/mapper/DataPlpMapper.xml index c17d65a..dd2f328 100644 --- a/src/main/resources/mapper/DataPlpMapper.xml +++ b/src/main/resources/mapper/DataPlpMapper.xml @@ -10,7 +10,7 @@ - + @@ -19,9 +19,11 @@ - + + + @@ -106,6 +108,12 @@ reason, + + taskdes, + + + changetime, + @@ -150,6 +158,12 @@ #{reason,jdbcType=VARCHAR}, + + #{taskdes,jdbcType=VARCHAR}, + + + now(), + @@ -194,6 +208,10 @@ reason=#{reason,jdbcType=VARCHAR}, + changetime=now(), + + taskdes=#{taskdes,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} -- Gitee From 4dbf4b273654dfa21d346e82fe82872104dbdbf2 Mon Sep 17 00:00:00 2001 From: root <123> Date: Thu, 2 Sep 2021 13:30:14 +0800 Subject: [PATCH 24/45] =?UTF-8?q?2021=E5=B9=B48=E6=9C=8831=20=20=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/controller/rest/CityGeomController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java index 83b006c..afb074b 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java @@ -29,12 +29,12 @@ public class CityGeomController { @GetMapping("/database") public ResponseResult fileToDataBase() { CityGeom cityGeom = new CityGeom(); - String filePath = "/root/直辖市"; + String filePath = "/root/taiwan"; List cityNames =new ArrayList<>(); List fileLists = FileUtil.getAllFile(filePath); for (int i = 0; i Date: Fri, 3 Sep 2021 09:37:20 +0800 Subject: [PATCH 25/45] =?UTF-8?q?2021=E5=B9=B4=209=E6=9C=883=E6=97=A5=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AEcity=E5=BD=95=E5=85=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cetc32/dh/entity/CityGeom.java | 105 ++++++++++++++++++ .../com/cetc32/dh/mybatis/CityGeomMapper.java | 11 ++ src/main/resources/mapper/CityGeomMapper.xml | 32 ++++++ 3 files changed, 148 insertions(+) create mode 100644 src/main/java/com/cetc32/dh/entity/CityGeom.java create mode 100644 src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java create mode 100644 src/main/resources/mapper/CityGeomMapper.xml diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java new file mode 100644 index 0000000..61c9e05 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java @@ -0,0 +1,105 @@ +package com.cetc32.dh.entity; + +import javax.persistence.*; + +@Table(name = "city_geom") +public class CityGeom { + private String city; + + @Column(name = "city_code") + private String cityCode; + + private Object geom; + + @Column(name = "polygon_text") + private String polygonText; + + @Column(name = "province_code") + private String provinceCode; + + private String province; + + /** + * @return city + */ + public String getCity() { + return city; + } + + /** + * @param city + */ + public void setCity(String city) { + this.city = city == null ? null : city.trim(); + } + + /** + * @return city_code + */ + public String getCityCode() { + return cityCode; + } + + /** + * @param cityCode + */ + public void setCityCode(String cityCode) { + this.cityCode = cityCode == null ? null : cityCode.trim(); + } + + /** + * @return geom + */ + public Object getGeom() { + return geom; + } + + /** + * @param geom + */ + public void setGeom(Object geom) { + this.geom = geom; + } + + /** + * @return polygon_text + */ + public String getPolygonText() { + return polygonText; + } + + /** + * @param polygonText + */ + public void setPolygonText(String polygonText) { + this.polygonText = polygonText == null ? null : polygonText.trim(); + } + + /** + * @return province_code + */ + public String getProvinceCode() { + return provinceCode; + } + + /** + * @param provinceCode + */ + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode == null ? null : provinceCode.trim(); + } + + /** + * @return province + */ + public String getProvince() { + return province; + } + + /** + * @param province + */ + public void setProvince(String province) { + this.province = province == null ? null : province.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java new file mode 100644 index 0000000..942e4dc --- /dev/null +++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java @@ -0,0 +1,11 @@ +package com.cetc32.dh.mybatis; + +import com.cetc32.dh.entity.CityGeom; +import com.cetc32.dh.entity.ProvinceGeom; +import org.springframework.stereotype.Repository; +import tk.mybatis.mapper.common.Mapper; + +@Repository +public interface CityGeomMapper extends Mapper { + public int updateByName(CityGeom cityGeom); +} diff --git a/src/main/resources/mapper/CityGeomMapper.xml b/src/main/resources/mapper/CityGeomMapper.xml new file mode 100644 index 0000000..9ec46f6 --- /dev/null +++ b/src/main/resources/mapper/CityGeomMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + update city_geom + + + geom = ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326), + polygon_text = st_astext(ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326)), + + + + geom = ST_geomfromtext(#{polygonText,jdbcType=VARCHAR},4326), + polygon_text = #{polygonText,jdbcType=VARCHAR}, + + + where city = #{city,jdbcType=VARCHAR} + + + -- Gitee From 5fef8419392dfa67a1a75716d9988b1afa938b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Tue, 7 Sep 2021 15:56:09 +0800 Subject: [PATCH 26/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0,=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E5=8F=8D=E9=A6=88=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AD=98=E5=82=A8=E4=B8=BA=E9=95=BF=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/EstimateTaskController.java | 27 ++++- .../rest/OtherInterfaceController.java | 53 +++++----- .../java/com/cetc32/dh/entity/DataPlp.java | 58 +++++++++-- .../com/cetc32/dh/entity/DataPlpCollect.java | 4 +- .../com/cetc32/dh/entity/EstimateTask.java | 12 ++- src/main/resources/mapper/DataPlpMapper.xml | 99 ++++++++++++------- .../resources/mapper/EstimateTaskMapper.xml | 21 ++-- 7 files changed, 195 insertions(+), 79 deletions(-) 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 65445f0..a6b4b93 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java @@ -1,6 +1,8 @@ package com.cetc32.dh.controller.rest; +import com.alibaba.fastjson.JSONObject; 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.dto.EstimateDTO; import com.cetc32.dh.entity.BaseAdminUser; @@ -173,9 +175,28 @@ public class EstimateTaskController { if(id == null){ return ResponseResult.error("id为空！"); } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.estimateTaskService.selectByPrimaryKey(id)); - return pdr; + return ResponseResult.success(this.estimateTaskService.selectByPrimaryKey(id)); + } + + /*** + * @Author xuwenyuan + * @Date 2021.9.7 added + * @Description 获取当前评估任务的反馈报告 + * @param id 评估任务ID + * @return ResponseData结构的对应信息 + * **/ + @GetMapping("/report") + public ResponseData checkCurrentReprot(Integer id){ + if(null == id || id<=0) + return ResponseData.error("无效的任务ID"); + try{ + return ResponseData.success(JSONObject.parseObject(estimateTaskService.selectByPrimaryKey(id).getReport())); + }catch ( NullPointerException e){ + return ResponseData.error("指定ID： " +id +" 不存在对应评估任务"); + }catch ( Exception e){ + e.printStackTrace(); + } + return ResponseData.error(); } @PostMapping("/deletebykey") 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 2a76ca4..1418988 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -1,6 +1,5 @@ package com.cetc32.dh.controller.rest; -import com.cetc32.dh.beans.DataCollected; import com.cetc32.dh.beans.DhOflineData; import com.cetc32.dh.beans.ReqSubmit; import com.cetc32.dh.beans.TraceUpload; @@ -22,9 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import tk.mybatis.mapper.util.StringUtil; import java.io.File; +import java.lang.reflect.Method; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -66,7 +65,7 @@ public class OtherInterfaceController { public ResponseData reqSubmit(ReqSubmit req, MultipartFile[] file) { DemandSubmit submit=new DemandSubmit(); - submit.setProjectName(req.getProject()); + //submit.setProjectName(req.getProject()); submit.setArea(req.getArea()); submit.setDepartmentid(req.getDepartment()); submit.setDemandDes(req.getDescription()); @@ -162,20 +161,17 @@ public class OtherInterfaceController { EstimateTask submit=estimateTaskService.selectByPrimaryKey(taskid); if(submit!=null) { - if(null !=report){ + /*if(null !=report){ if(StringUtils.isBlank(submit.getTaskPath())){ submit.setTaskPath(upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis()); } - saveBase64File(submit.getTaskPath(),0,0,report.split("base64,"),"EstimateReports"); - /*String upCachePath = upLoadPath + "_"+SecurityUserUtil.getUser().getId()+"_"+System.currentTimeMillis(); - String filepath = upCachePath; - String result = FileUtil.uploadFile(file, filepath); - if (result.contains("上传失败")) - return ResponseData.error(result); - submit.setTaskPath(filepath);*/ - } + saveBase64File(submit.getTaskPath(),0,0,report.split("base64,"),"EstimateReports",null,null);*//* + + submit.setTaskPath(filepath); + }*/ submit.setStatus(status); + submit.setReport(report); if(estimateTaskService.updateByPrimaryKeySelective(submit)>0) { return ResponseData.success("状态反馈成功"); @@ -268,8 +264,8 @@ public class OtherInterfaceController { && verifyEnventType(data)) { return ResponseData.error("无法识别的数据类型"); } - if(data.getDataType() !=null){ - switch ( data.getDataType()){ + if(data.getType() !=null){ + switch ( data.getType()){ case "120400":case "120500":case "120600":case "120700": case "130200":case "140200":case "260100":case "270100": case "140502":case "270201":case "140508":case "140510": @@ -281,9 +277,9 @@ public class OtherInterfaceController { default:return ResponseData.error("数据类型不在已知范围内"); } } - data.setSubmitor(SecurityUserUtil.getUser().getUsername()); + //data.setSubmitor(SecurityUserUtil.getUser().getUsername()); String msg="操作成功!"; - String filePath = upLoadPath + File.separator+"collect"+File.separator+SecurityUserUtil.getUser().getId() + String filePath = upLoadPath + File.separator+"collect"//+File.separator+SecurityUserUtil.getUser().getId() +File.separator+System.currentTimeMillis() ; if(null != data.getPhoto()){ String[] base64Data = data.getPhoto(); @@ -291,7 +287,11 @@ public class OtherInterfaceController { int errFiles=0; for(int i =0;i - - + + @@ -21,9 +21,15 @@ - - - + + + + + + + + + - select user_id,event_type as eventtype,points,region as cityname,create_time as uploadtime,description as describe,photo_byte from data_plp + select user_id,event_type as eventtype,points,region as city_name,create_time as uploadtime,description as describe,photo_byte from data_plp where 1 = 1 and status = #{status} @@ -334,16 +367,16 @@ - cityname = #{cityName,jdbcType=VARCHAR}, + city_name = #{cityName,jdbcType=VARCHAR}, - operatestate = #{operateState,jdbcType=VARCHAR}, + operate_state = #{operateState,jdbcType=VARCHAR}, - - datatype = #{dataType,jdbcType=VARCHAR}, + + type = #{type,jdbcType=VARCHAR}, - eventname = #{eventName,jdbcType=VARCHAR}, + event_name = #{eventName,jdbcType=VARCHAR}, approve_time = now() @@ -411,11 +444,8 @@ and create_time >= #{dataPlp.td_start}::timestamp - order by id desc - LIMIT #{limit} OFFSET #{offset} - @@ -445,7 +475,4 @@ - - - diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml index dd28fc0..34900cd 100644 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ b/src/main/resources/mapper/EstimateTaskMapper.xml @@ -17,7 +17,7 @@ - id, name, task_classify, task_type, task_path, starttime, endtime, creator, creattime, + id, name, task_classify, task_type, task_path, starttime, endtime, creator, creattime, status,approver,demandid,approvtime @@ -26,7 +26,7 @@ order by creattime DESC - \ No newline at end of file + -- Gitee From c1a157644fae65b7a73b3766aac3edf74cc455dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Tue, 7 Sep 2021 15:58:37 +0800 Subject: [PATCH 27/45] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BB=BB=E5=8A=A1mappe?= =?UTF-8?q?r=E6=98=A0=E5=B0=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/EstimateTaskMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml index 34900cd..d6b5177 100644 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ b/src/main/resources/mapper/EstimateTaskMapper.xml @@ -15,10 +15,11 @@ + id, name, task_classify, task_type, task_path, starttime, endtime, creator, creattime, - status,approver,demandid,approvtime + status,approver,demandid,approvtime,report + select * from city_geom + where city = #{name ,jdbcType=VARCHAR} + + -- Gitee From 80e9f3dda47c3f359af9a1842c101a7cbb4201ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Wed, 8 Sep 2021 10:23:25 +0800 Subject: [PATCH 29/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=B8=A6=E5=85=A5demandId=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/EstimateTaskController.java | 2 +- .../java/com/cetc32/dh/entity/EstimateTask.java | 12 ++++++------ src/main/resources/mapper/EstimateTaskMapper.xml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) 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 a6b4b93..7e27e69 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java @@ -103,7 +103,7 @@ public class EstimateTaskController { @ApiImplicitParam(name="creattimefront",value = "前端传来的创建时间",paramType = "body",dataType = "String",defaultValue = ""), @ApiImplicitParam(name="status",value = "状态",paramType = "body",dataType = "String",defaultValue = ""), @ApiImplicitParam(name="approver",value = "审批人",paramType = "body",dataType = "String",defaultValue = ""), - @ApiImplicitParam(name="demandid",value = "对应的需求id",paramType = "body",dataType = "Integer",defaultValue = ""), + @ApiImplicitParam(name="demandId",value = "对应的需求id",paramType = "body",dataType = "Integer",defaultValue = ""), @ApiImplicitParam(name = "frontyear",value = "前端传来的时间数组",paramType = "body" ,dataType = "List",defaultValue = ""), @ApiImplicitParam(name = "approvtime",value = "时间",paramType = "body" ,dataType = "Timestamp",defaultValue = ""), @ApiImplicitParam(name="useid",value = "对应的用户id",paramType = "body",dataType = "Integer",defaultValue = ""), diff --git a/src/main/java/com/cetc32/dh/entity/EstimateTask.java b/src/main/java/com/cetc32/dh/entity/EstimateTask.java index e14848f..4e28b97 100644 --- a/src/main/java/com/cetc32/dh/entity/EstimateTask.java +++ b/src/main/java/com/cetc32/dh/entity/EstimateTask.java @@ -32,7 +32,7 @@ public class EstimateTask extends NumberS{ private String approver; - private Integer demandid; + private Integer demandId; private List frontyear; @@ -141,12 +141,12 @@ public class EstimateTask extends NumberS{ this.approver = approver; } - public Integer getDemandid() { - return demandid; + public Integer getDemandId() { + return demandId; } - public void setDemandid(Integer demandid) { - this.demandid = demandid; + public void setDemandId(Integer demandId) { + this.demandId = demandId; } public String getStarttimefront() { @@ -196,7 +196,7 @@ public class EstimateTask extends NumberS{ public void setReport(String report) { this.report = report; } - + public String getTaskdes() { return taskdes; } diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml index f993257..3fd042c 100644 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ b/src/main/resources/mapper/EstimateTaskMapper.xml @@ -13,7 +13,7 @@ - + @@ -62,7 +62,7 @@ values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{taskClassify,jdbcType=VARCHAR}, #{taskType,jdbcType=VARCHAR}, #{taskPath,jdbcType=VARCHAR}, #{starttime,jdbcType=TIMESTAMP}, #{endtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{creattime,jdbcType=TIMESTAMP}, - #{status,jdbcType=VARCHAR},#{approver,jdbcType=VARCHAR},#{demadid,jdbcType=INTEGER},#{approvtime,jdbcType=TIMESTAMP}) + #{status,jdbcType=VARCHAR},#{approver,jdbcType=VARCHAR},#{demandId,jdbcType=INTEGER},#{approvtime,jdbcType=TIMESTAMP}) insert into estimate_task @@ -100,7 +100,7 @@ approver, - + demandid, @@ -150,8 +150,8 @@ #{approver,jdbcType=VARCHAR}, - - #{demandid,jdbcType=INTEGER}, + + #{demandId,jdbcType=INTEGER}, #{approvtime,jdbcType=TIMESTAMP}, @@ -200,8 +200,8 @@ approver = #{approver,jdbcType=VARCHAR}, - - demandid = #{demandid,jdbcType=INTEGER}, + + demandid = #{demandId,jdbcType=INTEGER}, approvtime=#{approvtime,jdbcType=TIMESTAMP}, @@ -231,7 +231,7 @@ creattime = #{creattime,jdbcType=TIMESTAMP}, status = #{status,jdbcType=VARCHAR}, approver = #{approver,jdbcType=VARCHAR}, - demandid = #{demandid,jdbcType=INTEGER}, + demandid = #{demandId,jdbcType=INTEGER}, approvtime=#{approvtime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=INTEGER} -- Gitee From 49c7ee543d284a1df52cfb19d60bce19cb5369d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Wed, 8 Sep 2021 14:03:34 +0800 Subject: [PATCH 30/45] =?UTF-8?q?=E6=97=A0j=E6=A3=80=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=E6=97=A0=E6=B3=95=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/common/response/PageDataResult.java | 15 ++++---- .../rest/DemanSubmitController.java | 18 +++++----- .../java/com/cetc32/dh/entity/NumberS.java | 1 + .../java/com/cetc32/dh/entity/vDemand.java | 2 +- .../cetc32/dh/mybatis/DemandSubmitMapper.java | 4 ++- .../dh/service/DemandSubmitService.java | 2 ++ .../impl/DemandSubmitServiceImppl.java | 5 +++ .../resources/mapper/DemandSubmitMapper.xml | 36 +++++++++++++++---- 8 files changed, 59 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java index 0b4fcad..1b93f10 100644 --- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java +++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java @@ -24,7 +24,7 @@ public class PageDataResult { private Integer code=200; //总记录数量 - private Integer totals; + private Long totals; private List list; @@ -38,18 +38,18 @@ public class PageDataResult { private List list_new; - public PageDataResult(int totals,List list){ + public PageDataResult(long totals,List list){ this.totals=totals; this.list=list; } - public PageDataResult(List list_new,int totals,int code){ + public PageDataResult(List list_new,long totals,int code){ this.code=code; this.totals=totals; this.list_new=list_new; } - public PageDataResult(int totals,List list,Integer offset){ + public PageDataResult(long totals,List list,Integer offset){ this.totals=totals; this.list=list; for(int i=0;i getList() { return list; 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 5584323..ea8f2f9 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -76,10 +76,10 @@ public class DemanSubmitController { && StringUtils.isBlank(vdemand.getTd_end() )&& StringUtils.isBlank(vdemand.getTd_start())){ List demandlist = new ArrayList<>(); - Integer count = 0; - demandlist = demandSubmitService.findAll(); - count = demandSubmitService.countDemand(); - return new PageDataResult(count,demandlist,page * results); + 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); @@ -119,13 +119,13 @@ public class DemanSubmitController { } } List demandlist = new ArrayList<>(); - Integer count = 0; + Long count = 0L; if((vdemand.getName()!=null&&vdemand.getName().contains("%"))||(vdemand.getPeople()!=null&&vdemand.getPeople().contains("%"))){ - return new PageDataResult(count,demandlist,page * results); - } + return new PageDataResult(count,demandlist,vdemand.getOffset()); + } demandlist = demandSubmitService.queryFilesByObj(vdemand); - count = demandSubmitService.queryFilesByObj(vdemand).size(); - return new PageDataResult(count,demandlist,page * results); + count = demandSubmitService.countFilesByObj(vdemand); + return new PageDataResult(count,demandlist,vdemand.getOffset()); } } diff --git a/src/main/java/com/cetc32/dh/entity/NumberS.java b/src/main/java/com/cetc32/dh/entity/NumberS.java index 663b2e2..eb075b3 100644 --- a/src/main/java/com/cetc32/dh/entity/NumberS.java +++ b/src/main/java/com/cetc32/dh/entity/NumberS.java @@ -53,4 +53,5 @@ public class NumberS { } + } diff --git a/src/main/java/com/cetc32/dh/entity/vDemand.java b/src/main/java/com/cetc32/dh/entity/vDemand.java index 0041b51..51febdc 100644 --- a/src/main/java/com/cetc32/dh/entity/vDemand.java +++ b/src/main/java/com/cetc32/dh/entity/vDemand.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.Date; -public class vDemand { +public class vDemand extends NumberS{ public String classify; public String name; public String people; diff --git a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java index 92fa4ab..bdf866a 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DemandSubmitMapper.java @@ -63,7 +63,9 @@ public interface DemandSubmitMapper { List queryFilesByObj(vDemand vdemand); + Long countFilesByObj(vDemand vDemand); + List searchbystatus(DemandSubmitDTO demandSubmitDTO); List alldemandclassify(); -} \ 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 c181d61..82b3542 100644 --- a/src/main/java/com/cetc32/dh/service/DemandSubmitService.java +++ b/src/main/java/com/cetc32/dh/service/DemandSubmitService.java @@ -61,6 +61,8 @@ public interface DemandSubmitService { List queryFilesByObj(vDemand vdemand); + Long countFilesByObj(vDemand vdemand); + List searchbystatus(DemandSubmitDTO demandSubmitDTO); List alldemandclassify(); 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 f097602..3380d83 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DemandSubmitServiceImppl.java @@ -135,6 +135,11 @@ public class DemandSubmitServiceImppl implements DemandSubmitService { return demandSubmitMapper.queryFilesByObj(vDemand); } + @Override + public Long countFilesByObj(vDemand vDemand){ + return demandSubmitMapper.countFilesByObj(vDemand); + } + @Override public List searchbystatus(DemandSubmitDTO demandSubmitDTO){ return demandSubmitMapper.searchbystatus(demandSubmitDTO); diff --git a/src/main/resources/mapper/DemandSubmitMapper.xml b/src/main/resources/mapper/DemandSubmitMapper.xml index 78001a2..5a4c08d 100644 --- a/src/main/resources/mapper/DemandSubmitMapper.xml +++ b/src/main/resources/mapper/DemandSubmitMapper.xml @@ -30,7 +30,7 @@ + + @@ -128,6 +133,26 @@ img_example, + + owner_unit, + + + + pub_unit, + + + + pub_time, + + + + ref_imgnum, + + + + ref_codenum, + + @@ -218,6 +243,26 @@ #{imgExample,jdbcType=VARCHAR}, + + #{ownerUnit,jdbcType=VARCHAR}, + + + + #{pubUnit,jdbcType=VARCHAR}, + + + + #{pubTime,jdbcType=TIMESTAMP}, + + + + #{refImgnum,jdbcType=VARCHAR}, + + + + #{refCodenum,jdbcType=VARCHAR}, + + @@ -400,6 +445,21 @@ img_example = #{imgExample,jdbcType=VARCHAR}, + + owner_unit = #{ownerUnit,jdbcType=VARCHAR}, + + + pub_unit = #{pubUnit,jdbcType=VARCHAR}, + + + pub_time = #{pubTime,jdbcType=TIMESTAMP}, + + + ref_imgnum = #{refImgnum,jdbcType=VARCHAR}, + + + ref_codenum = #{refCodenum,jdbcType=VARCHAR}, + approve_time = now() -- Gitee From 4f683ab8918ea27136f0580f3801d2fee2583dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Mon, 13 Sep 2021 15:50:14 +0800 Subject: [PATCH 33/45] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=97=A0=E7=94=A8Contr?= =?UTF-8?q?oller=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/common/shiro/CenterAuthRealm.java | 123 ----- .../common/shiro/CenterAuthShiroConfig.java | 251 ---------- .../cetc32/dh/common/shiro/CustomRealm.java | 199 -------- .../controller/rest/AreaCommonController.java | 80 ---- .../dh/controller/rest/AuthController.java | 448 ------------------ .../controller/rest/AuthRoleController.java | 147 ------ .../dh/controller/rest/CityController.java | 19 +- .../controller/rest/DataFileController.java | 2 - .../dh/controller/rest/DataPlpController.java | 9 +- .../controller/rest/DataTraceController.java | 4 - .../rest/DemanSubmitController.java | 13 +- .../controller/rest/DepartmentController.java | 215 --------- .../rest/EstimateTaskController.java | 8 +- .../rest/OrganizationController.java | 93 ---- .../rest/OtherInterfaceController.java | 4 - .../rest/ProductDemandController.java | 7 +- .../rest/ProvinceGeomController.java | 4 +- .../system/PermissionController.java | 154 ------ .../dh/controller/system/RoleController.java | 137 ------ .../dh/controller/system/UserController.java | 272 ----------- .../cetc32/dh/mybatis/AreaCommonMapper.java | 16 - .../dh/mybatis/BaseAdminPermissionMapper.java | 34 -- .../dh/mybatis/BaseAdminRoleMapper.java | 36 -- .../dh/mybatis/BaseAdminUserMapper.java | 58 --- .../cetc32/dh/mybatis/DepartmentMapper.java | 39 -- .../cetc32/dh/mybatis/OrganizationMapper.java | 30 -- .../dh/service/AdminPermissionService.java | 40 -- .../cetc32/dh/service/AdminRoleService.java | 40 -- .../cetc32/dh/service/AdminUserService.java | 57 --- .../cetc32/dh/service/AreaCommonService.java | 15 - .../cetc32/dh/service/DepartmentService.java | 28 -- .../dh/service/OrganizationService.java | 29 -- .../impl/AdminPermissionServiceImpl.java | 210 -------- .../dh/service/impl/AdminRoleServiceImpl.java | 128 ----- .../dh/service/impl/AdminUserServiceImpl.java | 379 --------------- .../service/impl/AreaCommonServiceImpl.java | 124 ----- .../service/impl/DepartmentServiceImpl.java | 123 ----- .../service/impl/OrganizationServiceImpl.java | 61 --- .../impl/ProductdemandServiceImpl.java | 4 +- .../resources/mapper/AreaCommonMapper.xml | 47 -- .../mapper/BaseAdminPermissionMapper.xml | 56 --- .../resources/mapper/BaseAdminRoleMapper.xml | 94 ---- .../resources/mapper/BaseAdminUserMapper.xml | 291 ------------ .../resources/mapper/DepartmentMapper.xml | 148 ------ .../resources/mapper/OrganizationMapper.xml | 94 ---- 45 files changed, 22 insertions(+), 4348 deletions(-) delete mode 100644 src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java delete mode 100644 src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java delete mode 100644 src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java delete mode 100644 src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/rest/AuthController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/system/PermissionController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/system/RoleController.java delete mode 100644 src/main/java/com/cetc32/dh/controller/system/UserController.java delete mode 100644 src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java delete mode 100644 src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java delete mode 100644 src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java delete mode 100644 src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java delete mode 100644 src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java delete mode 100644 src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java delete mode 100644 src/main/java/com/cetc32/dh/service/AdminPermissionService.java delete mode 100644 src/main/java/com/cetc32/dh/service/AdminRoleService.java delete mode 100644 src/main/java/com/cetc32/dh/service/AdminUserService.java delete mode 100644 src/main/java/com/cetc32/dh/service/AreaCommonService.java delete mode 100644 src/main/java/com/cetc32/dh/service/DepartmentService.java delete mode 100644 src/main/java/com/cetc32/dh/service/OrganizationService.java delete mode 100644 src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java delete mode 100644 src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java delete mode 100644 src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java delete mode 100644 src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java delete mode 100644 src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java delete mode 100644 src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java delete mode 100644 src/main/resources/mapper/AreaCommonMapper.xml delete mode 100644 src/main/resources/mapper/BaseAdminPermissionMapper.xml delete mode 100644 src/main/resources/mapper/BaseAdminRoleMapper.xml delete mode 100644 src/main/resources/mapper/BaseAdminUserMapper.xml delete mode 100644 src/main/resources/mapper/DepartmentMapper.xml delete mode 100644 src/main/resources/mapper/OrganizationMapper.xml diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java deleted file mode 100644 index 0ea702d..0000000 --- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthRealm.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * @Title: CenterAuthRealm - * @Description: 根据token判断此Authenticator是否使用该realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.common.shiro; - -import com.auth0.jwt.exceptions.TokenExpiredException; -import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.config.JWTToken; -import com.cetc32.dh.config.RedisUtil; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationInfo; -import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authc.SimpleAuthenticationInfo; -import org.apache.shiro.authz.AuthorizationInfo; -import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.realm.AuthorizingRealm; -import org.apache.shiro.subject.PrincipalCollection; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -@Component -public class CenterAuthRealm extends AuthorizingRealm { - /* @Autowired - private UserService userService;*/ - @Autowired - private RedisUtil redisUtil; - - //根据token判断此Authenticator是否使用该realm - //必须重写不然shiro会报错 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - public boolean supports(AuthenticationToken token) { - return token instanceof JWTToken; - } - - /** - * 只有当需要检测用户权限的时候才会调用此方法，例如@RequiresRoles,@RequiresPermissions之类的 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - System.out.println("授权~~~~~"); - String token=principals.toString(); - String username= JWTUtil.getUsername(token); - /*User user=userService.getUser(username);*/ - SimpleAuthorizationInfo info=new SimpleAuthorizationInfo(); - //查询数据库来获取用户的角色 - /*info.addRole(user.getRoles()); - //查询数据库来获取用户的权限 - info.addStringPermission(user.getPermission());*/ - return info; - } - - - /** - * 默认使用此方法进行用户名正确与否验证，错误抛出异常即可，在需要用户认证和鉴权的时候才会调用 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { - System.out.println("认证~~~~~~~"); - String jwt= (String) token.getCredentials(); - String username= null; - try { - username= JWTUtil.getUsername(jwt); - }catch (Exception e){ - throw new AuthenticationException("token非法，不是规范的token，可能被篡改了，或者过期了"); - } - if (username==null){ - throw new AuthenticationException("token中无用户名"); - } - /*User user=userService.getUser(username);*/ - /*if (user==null){ - throw new AuthenticationException("该用户不存在"); - }*/ - //开始认证，只要AccessToken没有过期，或者refreshToken的时间节点和AccessToken一致即可 - if (redisUtil.hasKey(username)){ - //判断AccessToken有无过期 - if (!JWTUtil.verify(jwt)){ - throw new TokenExpiredException("token认证失效，token过期，重新登陆"); - }else { - //判断AccessToken和refreshToken的时间节点是否一致 - long current= (long) redisUtil.get(username); - if (current==JWTUtil.getExpire(jwt)){ - return new SimpleAuthenticationInfo(jwt,jwt,"MyRealm"); - }else{ - throw new AuthenticationException("token已经失效，请重新登录！"); - } - } - }else{ - throw new AuthenticationException("token过期或者Token错误！！"); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java deleted file mode 100644 index d06c8ae..0000000 --- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java +++ /dev/null @@ -1,251 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: Shiro安全认证 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.common.shiro; - -import com.cetc32.dh.common.filter.JWTFilter; -import org.apache.shiro.cas.CasFilter; -import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; -import org.apache.shiro.mgt.DefaultSubjectDAO; -import org.apache.shiro.spring.LifecycleBeanPostProcessor; -import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; -import org.apache.shiro.spring.web.ShiroFilterFactoryBean; -import org.apache.shiro.web.mgt.DefaultWebSecurityManager; -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; -import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.web.filter.DelegatingFilterProxy; - -import javax.servlet.Filter; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -@Configuration -public class CenterAuthShiroConfig { - -// //cas server地址 -// public static final String casServerUrlPrefix="http://www.cetc.daohang.com:9100/cas"; -// -// //cas登录页面地址 -// public static final String casLoginUrl = casServerUrlPrefix + "/login"; -// -// //cas登出页面地址 -// public static final String casLogoutUrl = casServerUrlPrefix + "/logout"; -// -// //当前工程对外提供的服务地址 -// public static final String shiroServerUrlPrefix = "http://localhost:9100"; -// -// //casFilter UrlPattern -// public static final String casFilterUrlPattern = "/cas"; -// -// //登录地址 -// public static final String loginUrl = casLoginUrl + "?service=" + shiroServerUrlPrefix + casFilterUrlPattern; -// -// // 登出地址（casserver启用service跳转功能，需在webapps\cas\WEB-INF\cas.properties文件中启用cas.logout.followServiceRedirects=true） -// public static final String logoutUrl = casLogoutUrl + "?service=" + shiroServerUrlPrefix; -// -// //登录成功地址 -// public static final String loginSuccessUrl = "/user"; -// -// //限认证失败跳转地址 -// public static final String unauthorizedUrl = "/403.html"; -// -// @Value("${jedis.pool.host}") -// private String host; -// -// @Value("${jedis.pool.port}") -// private int port; - - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean(name = "securityManager") - public DefaultWebSecurityManager securityManager(CenterAuthRealm centerAuthRealm){ - DefaultWebSecurityManager securityManager=new DefaultWebSecurityManager(); - // 设置自定义 realm. - securityManager.setRealm(centerAuthRealm); - - //关闭session - DefaultSubjectDAO subjectDAO=new DefaultSubjectDAO(); - DefaultSessionStorageEvaluator sessionStorageEvaluator=new DefaultSessionStorageEvaluator(); - sessionStorageEvaluator.setSessionStorageEnabled(false); - subjectDAO.setSessionStorageEvaluator(sessionStorageEvaluator); - securityManager.setSubjectDAO(subjectDAO); - return securityManager; - } - -// /** -// * 注册单点登出listener -// * -// * @return -// */ -// @Bean -// @Order(Ordered.HIGHEST_PRECEDENCE) -// public ServletListenerRegistrationBean singleSignOutHttpSessionListener() { -// ServletListenerRegistrationBean bean = new ServletListenerRegistrationBean(); -// bean.setListener(new SingleSignOutHttpSessionListener()); -// bean.setEnabled(true); -// return bean; -// } -// -// /** -// * 注册单点登出filter -// * -// * @return -// */ -// @Bean -// public FilterRegistrationBean singleSignOutFilter() { -// FilterRegistrationBean bean = new FilterRegistrationBean(); -// bean.setName("singleSignOutFilter"); -// bean.setFilter(new SingleSignOutFilter()); -// bean.addUrlPatterns("/*"); -// bean.setEnabled(true); -// return bean; -// } -// -// /** -// * 注册DelegatingFilterProxy（Shiro） -// * -// * @return -// */ -// @Bean -// public FilterRegistrationBean delegatingFilterProxy() { -// FilterRegistrationBean filterRegistration = new FilterRegistrationBean(); -// filterRegistration.setFilter(new DelegatingFilterProxy("shiroFilter")); -// // 该值缺省为false,表示生命周期由SpringApplicationContext管理,设置为true则表示由ServletContainer管理 -// filterRegistration.addInitParameter("targetFilterLifecycle", "true"); -// filterRegistration.setEnabled(true); -// filterRegistration.addUrlPatterns("/*"); -// return filterRegistration; -// } - -// /** -// * CAS过滤器 -// * -// * @return -// */ -// @Bean(name = "casFilter") -// public CasFilter getCasFilter() { -// CasFilter casFilter = new CasFilter(); -// casFilter.setName("casFilter"); -// casFilter.setEnabled(true); -// // 登录失败后跳转的URL，也就是 Shiro 执行 CasRealm 的 doGetAuthenticationInfo 方法向CasServer验证tiket -// casFilter.setFailureUrl(loginUrl);// 我们选择认证失败后再打开登录页面 -// casFilter.setSuccessUrl(loginSuccessUrl); -// return casFilter; -// } - - - - /** - * 先走 filter ，然后 filter 如果检测到请求头存在 token，则用 token 去 login，走 Realm 去验证 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - public ShiroFilterFactoryBean factory(@Qualifier("securityManager")DefaultWebSecurityManager securityManager){ - ShiroFilterFactoryBean factoryBean=new ShiroFilterFactoryBean(); - factoryBean.setSecurityManager(securityManager); - // 添加自己的过滤器并且取名为jwt - Map filterMap=new LinkedHashMap<>(); - //设置我们自定义的JWT过滤器 - filterMap.put("jwt",new JWTFilter()); - factoryBean.setFilters(filterMap); - - // 设置无权限时跳转的 url; - factoryBean.setUnauthorizedUrl("/unauthorized/无权限"); - Map filterRuleMap=new HashMap<>(); - // 所有请求通过我们自己的JWT Filter - filterRuleMap.put("/**","jwt"); - // 访问 /unauthorized/** 不通过JWTFilter - filterRuleMap.put("/unauthorized/**","anon"); - filterRuleMap.put("/open/**","anon"); - //filterRuleMap.put("/rest/**","anon"); - factoryBean.setFilterChainDefinitionMap(filterRuleMap); - return factoryBean; - } - - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() { - return new LifecycleBeanPostProcessor(); - } - - - - /** - * 添加注解支持，如果不加的话很有可能注解失效 - */ - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - // @DependsOn({"lifecycleBeanPostProcessor"}) - public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator(){ - - DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator=new DefaultAdvisorAutoProxyCreator(); - defaultAdvisorAutoProxyCreator.setProxyTargetClass(true); - return defaultAdvisorAutoProxyCreator; - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Bean - public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(@Qualifier("securityManager") DefaultWebSecurityManager securityManager){ - - AuthorizationAttributeSourceAdvisor advisor=new AuthorizationAttributeSourceAdvisor(); - advisor.setSecurityManager(securityManager); - return advisor; - } - - - -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java b/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java deleted file mode 100644 index 4ba5fad..0000000 --- a/src/main/java/com/cetc32/dh/common/shiro/CustomRealm.java +++ /dev/null @@ -1,199 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: 自定义Realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.common.shiro; - -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; -import com.cetc32.dh.mybatis.BaseAdminRoleMapper; -import com.cetc32.dh.service.AdminRoleService; -import com.cetc32.dh.service.AdminUserService; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.shiro.authc.*; -import org.apache.shiro.authz.AuthorizationInfo; -import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.cas.CasRealm; -import org.apache.shiro.subject.PrincipalCollection; -import org.apache.shiro.util.ByteSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -public class CustomRealm extends CasRealm { - - private Logger log = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminUserService userService; - @Autowired - private BaseAdminUser baseAdminUser; - @Autowired - private AdminRoleService roleService; - @Autowired - private BaseAdminPermissionMapper permissionMapper; - @Autowired - private BaseAdminRoleMapper roleMapper; - //模拟数据库的数据 - Map map=new HashMap(); - { - map.put("jarWorker","123"); - super.setName("customRealm"); - } - /** - * 授权使用 - * @param principals - * @return - */ - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - BaseAdminUser userName=(BaseAdminUser) principals.getPrimaryPrincipal(); - Set roles=getRolesByUserName(userName.getSysUserName()); - Set permissions=getPermissionsByUserName(userName.getSysUserName()); - SimpleAuthorizationInfo simpleAuthorizationInfo=new SimpleAuthorizationInfo(); - log.info("开始授权"); - simpleAuthorizationInfo.setRoles(roles); - simpleAuthorizationInfo.setStringPermissions(permissions); - return simpleAuthorizationInfo; - } - - - /** - * 认证使用 - * @param - * @return - */ - protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException { -// //从主体传过来的认证信息中获取用户名 -// String userName=(String) token.getPrincipal();//获取用户名 -// String passWord=getPassword(userName); -// if(passWord==null){ -// return null; -// } -// SimpleAuthenticationInfo simpleAuthenticationInfo=new SimpleAuthenticationInfo("",passWord,"customRealm"); -// return simpleAuthenticationInfo; - //UsernamePasswordToken用于存放提交的登录信息 - UsernamePasswordToken token = (UsernamePasswordToken) authenticationToken; - log.info("用户登录认证：验证当前Subject时获取到token为：" + ReflectionToStringBuilder - .toString(token, ToStringStyle.MULTI_LINE_STYLE)); - String username = token.getUsername(); - // 调用数据层 - BaseAdminUser sysUser = userService.findByUserName(username); - log.debug("用户登录认证！用户信息user：" + sysUser); - if (sysUser == null) { - // 用户不存在 - return null; - } - // 返回密码 - return new SimpleAuthenticationInfo(sysUser, sysUser.getSysUserPwd(), ByteSource.Util.bytes(username), getName()); - - } - - /** - * 数据库信息获取用户密码 - * @param userName - * @return - */ - private String getPassword(String userName) { - if(null==userName){ - return null; - } - BaseAdminUser adminUser = new BaseAdminUser(); - adminUser = userService.findByUserName(userName); - String pwd = adminUser.getSysUserPwd(); - return pwd; - } - - /** - * 数据库获取用户角色 - * @param userName - * @return - */ - private Set getRolesByUserName(String userName) { -// Set roles=new HashSet(); -// roles.add("admin"); -// roles.add("tourist"); -// return roles; - - Set roles = new HashSet(); - - BaseAdminUser user = userService.findByUserName(userName); - List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList()); - for(Integer rid:roleId) - { - BaseAdminRole baseAdminRole = roleMapper.selectByPrimaryKey(rid); - roles.add(baseAdminRole.getRoleName()); - } - return roles; - - } - - /** - * 模拟数据库获取用户权限 - * @param userName - * @return - */ - private Set getPermissionsByUserName(String userName) { - /*Set permissions=new HashSet(); - permissions.add("user:update"); - permissions.add("user:query"); - return permissions;*/ - Set per = new HashSet(); - BaseAdminUser user = userService.findByUserName(userName); - List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList()); - List rids=new ArrayList<>(); - for(Integer rid:roleId) - { - ResultUserRole baseAdminRole = roleService.findRoleById(rid); -// String permissions = role.getPermissions(); -// rids.addAll(Arrays.asList(permissions.split(","))); - } - rids=rids.stream().distinct().collect(Collectors.toList()); - if (rids.size()>0) { - List permissionList = new ArrayList <>(); - for (String id : rids) { - // 角色对应的权限数据 - BaseAdminPermission perm = permissionMapper.selectByPrimaryKey(id); - if (null != perm ) { - // 授权角色下所有权限 - PermissionDTO permissionDTO = new PermissionDTO(); - BeanUtils.copyProperties(perm,permissionDTO); - //获取子权限 - List childrens = permissionMapper.getPermissionListByPId(perm.getId()); - permissionDTO.setChildrens(childrens); - - permissionList.add(permissionDTO); - } - } - - for(PermissionDTO permissionDTO:permissionList){ - per.add(permissionDTO.getName()); - } - - - } - return per; - - } -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java deleted file mode 100644 index 3de6a77..0000000 --- a/src/main/java/com/cetc32/dh/controller/rest/AreaCommonController.java +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************************* - * @Description： - * @Author ：黄子君 - * @version：1.0 - * @date ： 2021/1/21 下午4:45 - ******************************************************************************/ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.webutil.common.annotations.LoginSkipped; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import java.util.Arrays; -import java.util.List; - -@Slf4j -@LoginSkipped -@RestController -@RequestMapping("/rest/area") -/** - * 地理范围接口操作类 - * @author: 黄子君 - * @version: 1.0 - * @date: 2020/10/14 - * 备注:无 - */ -public class AreaCommonController { - - @Autowired - private AreaCommonService areaCommonService; - - - @ApiOperation(value = "查询地理范围树结构") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全国", dataType = "String"), - }) - @RequestMapping(value = "/all", method = RequestMethod.GET) - public ResponseResult areaCommonTree(String id) { - if (id == null) { - id = "100000"; - } -// List areaCommonDTO = areaCommonService.getAreaTreeList(id); - return ResponseResult.success(areaCommonService.getAreaTreeList(id)); - } - - @ApiOperation(value = "根据ID查询区域范围") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "全国统一编码ID值", dataType = "String"), - }) - @RequestMapping(value = "/get", method = RequestMethod.GET) - public ResponseResult getAreaById(String id) { - - AreaCommon areaCommon = areaCommonService.getById(id); - if (areaCommon == null) { - return ResponseResult.error("无该ID所属区域。"); - } - return ResponseResult.success(areaCommon); - } - - @RequestMapping(value = "/ids", method = RequestMethod.GET) - public ResponseResult getByIDs(@RequestBody String[] ids) { - - List tbList = Arrays.asList(ids); - List areaCommon = areaCommonService.getAreasByIdList(tbList); - if (areaCommon == null) { - return ResponseResult.error("无该ID所属区域。"); - } - return ResponseResult.success(areaCommon); - } - -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java deleted file mode 100644 index 6428a28..0000000 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ /dev/null @@ -1,448 +0,0 @@ -/** - * @Description: 权限管理 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.beans.LoginParameter; -import com.cetc32.dh.beans.LoginResult; -import com.cetc32.dh.beans.ResultUserInfo; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.beans.*; -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.common.utils.JWTUtil; -import com.cetc32.dh.config.RedisUtil; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.mybatis.AreaCommonMapper; -import com.cetc32.dh.mybatis.BaseAdminUserMapper; -import com.cetc32.dh.service.AdminUserService; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.impl.AdminRoleServiceImpl; -import com.cetc32.dh.service.impl.AdminUserServiceImpl; -import com.cetc32.dh.service.impl.AreaCommonServiceImpl; -import com.google.inject.internal.util.$FinalizableWeakReference; -import com.google.inject.internal.util.$ObjectArrays; -import com.google.inject.internal.util.$ToStringBuilder; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.crypto.interfaces.PBEKey; -import javax.servlet.http.HttpServletRequest; -import java.awt.*; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Type; -import java.util.*; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import com.cetc32.dh.common.utils.DigestUtils; - -import static com.cetc32.dh.common.utils.Tools.*; - -/** - * 数据管理配置 - * @author: 徐文远 - * @version: 1.0 - * @date: 2020/9/11 10:55 - * @Description: MVC配置信息 - * 更改描述： - */ -@RestController -@RequestMapping("/rest/auth/") -public class AuthController { - - @Autowired - RedisUtil redisUtil; - - @Autowired - AdminUserServiceImpl userService; - - @Autowired - AreaCommonMapper areaCommonMapper; - - /** - * 用户登陆 - * @param loginParameter "包含username和password的json字符串" - * @return ResponseData - * 备注:无 - */ - @ApiOperation(value = "用户登录验证，并返回用户相应角色", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), - @ApiImplicitParam(name = "password", value = "密码", paramType = "String") - }) - @PostMapping("/login") - public ResponseData login2(@RequestBody LoginParameter loginParameter){ - String username=loginParameter.getUsername(); - String password=loginParameter.getPassword(); - if(username==null || password==null || password.length()==0) - { - return ResponseData.error("用户名和密码不能为空！"); - } - BaseAdminUser user= userService.findByUserName(username); - if(user==null || !user.getSysUserPwd().equals(DigestUtils.Md5(username,password))) - { - return ResponseData.error("账户信息有误或未审核！"); - } - long currentTimeMillis = System.currentTimeMillis(); - String token= JWTUtil.createToken(username,currentTimeMillis); - redisUtil.set(username,currentTimeMillis,60*30); - LoginResult data=new LoginResult(token, - user.getDepartment(), - username, - user.getId(), - user.getRoleId(), - user.getSecurity(), - user.getAreacode(), - JWTUtil.getExpire(token)); - return ResponseData.success(200,"success",data); - } - - - @ApiOperation(value = "移动终端用户注册（固定角色、固定为非M权限)", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), - @ApiImplicitParam(name = "password", value = "密码", paramType = "String") - }) - @PostMapping(value="/register",produces = "application/json;charset=UTF-8") - public ResponseData register(@RequestBody Map loginParameter){ - Map reg=new HashMap<>(); - reg.put("username",loginParameter.getOrDefault("username",null)); - reg.put("password",loginParameter.getOrDefault("password",null)); - BaseAdminUser userInfo=CreateUser(reg); - String username=userInfo.getSysUserName(); - if(StringUtils.isBlank(username)) - { - return ResponseData.error("用户名不能为空！"); - } - if(userService.findByUserNameAll(username)!=null) - { - return ResponseData.error("用户名已存在！"); - } - if(StringUtils.isBlank(userInfo.getSysUserPwd())){ - return ResponseData.error("密码不能为空！"); - } - //默认用户有效 - userInfo.setUserStatus(-1); - userInfo.setRegTime(new Date()); - // TODO 默认安全等级 - if(userInfo.getSecurity()==null) - { - userInfo.setSecurity(3); - } - if(userService.insertUser(userInfo)>0) - { - return ResponseData.success("添加成功"); - } - else { - return ResponseData.error("添加失败"); - } - } - - @ApiOperation(value = "用户添加", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), - @ApiImplicitParam(name = "password", value = "密码", paramType = "String"), - @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"), - @ApiImplicitParam(name = "security", value = "密级(1:JM，2：MM，3：FM)", paramType = "Integer"), - @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"), - @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List") - }) - @PostMapping("/user") - public ResponseData AddUser(@RequestBody Map userMap){ - BaseAdminUser userInfo=CreateUser(userMap); - String username=userInfo.getSysUserName(); - if(StringUtils.isBlank(username)) - { - return ResponseData.error("用户名不能为空！"); - } - if(userService.findByUserName(username)!=null) - { - return ResponseData.error("用户名已存在！"); - } - if(StringUtils.isBlank(userInfo.getSysUserPwd())){ - userInfo.setSysUserPwd(DigestUtils.Md5(username,"123456")); - } - //默认用户有效 - userInfo.setUserStatus(1); - long currentTimeMillis = System.currentTimeMillis(); - userInfo.setRegTime(new Date()); - // TODO 默认安全等级 - if(userInfo.getSecurity()==null) - { - userInfo.setSecurity(3); - } - if(userService.insertUser(userInfo)>0) - { - return ResponseData.success("添加成功"); - } - else { - return ResponseData.error("添加失败"); - } - } - - @ApiOperation(value = "用户删除（仅标记不从数据库删除）", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "用户id", paramType = "Integer"), - }) - @PostMapping(value = "/deleteUser") - public ResponseData deleteUser(@RequestBody Map did){ - Integer id=did.getOrDefault("id",0); - if(userService.delUser(id,0)>0) - { - return ResponseData.success("删除成功！"); - } - else - { - return ResponseData.error("删除失败！"); - } - } - @PostMapping(value = "/reject") - public ResponseData rejectUser(@RequestBody Map did){ - Integer id=did.getOrDefault("id",0); - if(userService.delUser(id,0)>0) - { - return ResponseData.success("删除成功！"); - } - else - { - return ResponseData.error("删除失败！"); - } - } - @ApiOperation(value = "用户删除（从数据库中删除不可恢复）", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "用户id", paramType = "Integer"), - }) - @PostMapping(value = "/deleteInfo") - public ResponseData deleteUser1(@RequestBody Map did){ - Integer id=did.getOrDefault("id",0); - if(userService.deleteInfo(id)>0) - { - return ResponseData.success("删除成功！"); - } - else - { - return ResponseData.error("删除失败！"); - } - } - - @ApiOperation(value = "条件用户查找", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), - @ApiImplicitParam(name = "role", value = "单个角色id", paramType = "Integer"), - @ApiImplicitParam(name = "security", value = "密级", paramType = "Integer"), - @ApiImplicitParam(name = "department", value = "单个部门id", paramType = "Integer"), - @ApiImplicitParam(name = "areacode", value = "单个区域id", paramType = "Integer"), - @ApiImplicitParam(name = "page", value = "页码",dataType = "Integer",defaultValue = "1"), - @ApiImplicitParam(name = "results", value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - @ApiImplicitParam(name = "userStatus", value = "用户状态（-1：待审核，0：已删除，1：正常）",dataType = "Integer",defaultValue = "1") - }) - @PostMapping(value = "/users") - //@GetMapping(value = "/users") - // public PageDataResult getUserList(@RequestBody UserInfo user_info){ - public PageDataResult getUserList(@RequestBody Map userInfo){ - BaseAdminUser user_info=CreateUser(userInfo); - return new PageDataResult(userService.countUserByCondition(user_info), - userService.findUserByCondition(user_info), - user_info.getOffset()); - } - - - @ApiOperation(value = "注册用户激活及信息修改", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), - @ApiImplicitParam(name = "password", value = "密码", paramType = "String"), - @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"), - @ApiImplicitParam(name = "security", value = "密级", paramType = "Integer"), - @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"), - @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List") - }) - @PutMapping({"/activeUser"}) - public ResponseData activeUser(@RequestBody Map postPara){ - postPara.put("userStatus",1); - return updateUser(postPara); - } - - @ApiOperation(value = "用户修改", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "username", value = "用户名", paramType = "String"), - @ApiImplicitParam(name = "password", value = "密码", paramType = "String"), - @ApiImplicitParam(name = "role", value = "角色id列表", paramType = "List"), - @ApiImplicitParam(name = "security", value = "密级", paramType = "Integer"), - @ApiImplicitParam(name = "department", value = "部门id列表", paramType = "List"), - @ApiImplicitParam(name = "areacode", value = "区域id列表", paramType = "List") - }) - @PutMapping({"/user"}) - public ResponseData updateUser(@RequestBody Map postPara){ - - BaseAdminUser userInfo=CreateUser(postPara); - String username=userInfo.getSysUserName(); - if(StringUtils.isEmpty(username)) - { - return ResponseData.error("用户名不能为空！"); - } - BaseAdminUser user= userService.findByUserNameAll(username); - if(user==null) - { - return ResponseData.error("用户不存在！"); - } - userInfo.setId(user.getId()); - if(userService.updateUserInfo(userInfo)>0) - { - return ResponseData.success("更新成功！"); - } - else{ - return ResponseData.error("更新失败！"); - } - - } - - /** - * Map到实体的转化,同时兼容区域传id或区域名 - * @param userInfo - * @return - */ - private BaseAdminUser CreateUser(Map userInfo) - { - BaseAdminUser user_info=new BaseAdminUser(); - if(userInfo != null && userInfo.size()>0) - { - user_info=new BaseAdminUser(); - Object areaCodeName=userInfo.getOrDefault("areaCodeName",null); - if(areaCodeName==null) - { - areaCodeName=userInfo.getOrDefault("areacode",null); - } - if(areaCodeName!=null) - { - user_info.setAreacode(areaCodeName); - if(isContainChinese(user_info.getAreacode())) - { - List areaCommons = areaCommonMapper.selectAll(); - List areaCode=new ArrayList<>(); - Map areaCommonsMap = - areaCommons.stream().collect(Collectors.toMap(AreaCommon::getName, AreaCommon::getId)); - for(String i:user_info.getAreaCodeList()) - { - if(areaCommonsMap.getOrDefault(i, null)!=null) - { - areaCode.add(areaCommonsMap.getOrDefault(i, null)); - } - } - user_info.setAreacode(areaCode); - } - } - user_info.setId(getMapValueInt(userInfo,"id")); - // 用户名需要在密码之前赋值 - // 用户名去除两端空格 - user_info.setSysUserName(StringUtils.trim(getMapValueStr(userInfo,"username"))); - String password=getMapValueStr(userInfo,"password"); - if(password!=null && user_info.getSysUserName()!=null && password.trim().length()>0) - { - user_info.setSysUserPwd(DigestUtils.Md5(user_info.getSysUserName(),password)); - } - else - { - user_info.setSysUserPwd(null); - } - user_info.setRoleId(userInfo.getOrDefault("role",null)); - user_info.setDepartment(userInfo.getOrDefault("department",null)); - user_info.setSecurity(getMapValueInt(userInfo,"security")); - user_info.setPage(getMapValueInt(userInfo,"page")); - user_info.setResults(getMapValueInt(userInfo,"results")); - user_info.setUserStatus(getMapValueInt(userInfo,"userStatus")); - } - return user_info; - - } - - /** - * 注销 - * @param token - * @return ResponseData - * 备注:无 - */ - @ApiOperation(value = "用户登出", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"), - }) - @PostMapping("/logout") - public ResponseData logout(String token){ - if(token!=null) - { - String username=JWTUtil.getUsername(token); - redisUtil.del(username); - } - return ResponseData.success(); - } - - - /** - * 注销 - * @param token - * @return ResponseData - * 备注:无 - */ - @ApiOperation(value = "token校验", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"), - }) - @GetMapping("/token") - public ResponseData token(String token){ - if(token!=null ) - { - String username=JWTUtil.getUsername(token); - if(username!=null && JWTUtil.verify(token)) - { - BaseAdminUser user= userService.findByUserName(username); - if(user!=null) - { - long currentTimeMillis = System.currentTimeMillis()/1000; - long exp=JWTUtil.getExpire(token); - if(exp>currentTimeMillis) - { - ResultUserInfo data=new ResultUserInfo(); - data.setSecurity(user.getSecurity()); - data.setAreacode(user.getAreacode()); - data.setDepartment(user.getDepartment()); - data.setRole(user.getRoleId()); - data.setUsername(username); - return ResponseData.success(200,"success",data); - } - else - { - return ResponseData.error("token 已过期！"); - } - } - } - return ResponseData.error("token 认证失败！"); - } - return ResponseData.error("缺少参数token！"); - } - - /** - * 非授权用户登陆 - * @param message - * @return ResponseResult - * 备注:无 - */ - @PostMapping(path = "/unauthorized/{message}") - public ResponseResult unauthorized(@PathVariable String message) throws UnsupportedEncodingException { - return ResponseResult.fail(message); - } -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java deleted file mode 100644 index 19b7107..0000000 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthRoleController.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.Tools; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseData; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.service.impl.AdminRoleServiceImpl; -import com.cetc32.dh.service.impl.AdminUserServiceImpl; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.Map; - -@RestController -@RequestMapping("/rest/role/") -public class AuthRoleController { - @Autowired - AdminRoleServiceImpl adminRoleService; - - @Autowired - AdminUserServiceImpl userService; - - @ApiOperation(value = "获取角色列表（分页）", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), - @ApiImplicitParam(name="results",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - }) - @PostMapping(value = "/getAll") - public PageDataResult getRoles(@RequestBody NumberS number){ - return new PageDataResult(adminRoleService.countRoles(), adminRoleService.getAllRoles(number),number.getOffset()); - } - - @ApiOperation(value = "获取角色列表(不分页)", notes = "") - @GetMapping(value = "/list") - public ResponseData getRolesList(){ - return ResponseData.success(adminRoleService.getRoleList()); - } - - /** - *角色新增 - * @param newRole - */ - @ApiOperation(value = "角色新增", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "id(不用传入)",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="roleName",value = "角色名称",dataType = "String"), - }) - @PostMapping("/add") - @ResponseBody - public ResponseData addRole(@RequestBody ResultUserRole newRole) { - String roleName= newRole.getRoleName().trim(); - if(roleName.isEmpty()) - { - return ResponseData.error("角色名不能为空！"); - } - ResultUserRole role = adminRoleService.findRoleByName(roleName); - if(role !=null) - { - return ResponseData.error("角色名已存在！"); - } - if(newRole.getId() == null){ - BaseAdminRole br=new BaseAdminRole(); - BeanUtils.copyProperties(newRole, br); - //新增角色 - if(adminRoleService.addRole(br)>0) - { - return ResponseData.success("添加成功！"); - } - } - return ResponseData.error("添加失败！"); - } - - - @ApiOperation(value = "更新角色", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "要更新的角色id",dataType = "Integer",defaultValue = ""), - @ApiImplicitParam(name="roleName",value = "角色名称",dataType = "String"), - }) - @PostMapping("/update") - @ResponseBody - public ResponseData updateRole(@RequestBody ResultUserRole role) { - String roleName= role.getRoleName().trim(); - if(roleName.isEmpty() || role.getId() == null) - { - return ResponseData.error("角色名或角色id不能为空！"); - } - ResultUserRole rr=adminRoleService.findRoleById(role.getId()); - if(rr==null) - { - return ResponseData.error("角色不存在!"); - } - if(rr.getIsDefault() == 1) - { - if(!Tools.isListEqual(rr.getSystemMenu(),role.getSystemMenu())) - { - return ResponseData.error("内置角色不能修改权限！"); - } - } - BaseAdminRole br=new BaseAdminRole(); - BeanUtils.copyProperties(role, br); - if(adminRoleService.updateRole(br)>0) - { - return ResponseData.success("修改成功！"); - }; - return ResponseData.error("修改失败！"); - } - - @ApiOperation(value = "删除角色", notes = "") - @ApiImplicitParams({ - @ApiImplicitParam(name="id",value = "要删除的角色id",dataType = "Integer",defaultValue = "") - }) - @PostMapping("/delete") - @ResponseBody - public ResponseData deleteRole(@RequestBody Map mapId) { - Integer id=mapId.getOrDefault("id",null); - if(id == null) - { - return ResponseData.error("角色id不能为空！"); - } - ResultUserRole rr=adminRoleService.findRoleById(id); - if(rr != null && rr.getIsDefault() == 1) - { - return ResponseData.error("内置角色不能删除！"); - } - BaseAdminUser user_info=new BaseAdminUser(); - user_info.setRoleId(id); - if(userService.findUserByCondition(user_info).size()>0) - { - return ResponseData.error("请先删除具有该角色的人员！"); - } - if(adminRoleService.delRoleByID(id)>0) - { - return ResponseData.success("删除成功！"); - }; - - return ResponseData.error("删除失败！"); - } -} diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityController.java b/src/main/java/com/cetc32/dh/controller/rest/CityController.java index d3608bb..3ad4c63 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityController.java @@ -1,3 +1,11 @@ +/******************************************************************************* + * Copyright（C） CETC-32 + * @Description： + * @Author ：徐文远 + * @version：1.0 + * @date ： 2021/9/13 下午3:22 + ******************************************************************************/ + /******************************************************************************* * @Description： * @Author ：肖小霞 @@ -7,9 +15,6 @@ package com.cetc32.dh.controller.rest; import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.City; -import com.cetc32.dh.service.AreaCommonService; import com.cetc32.dh.service.CityService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,14 +36,14 @@ import java.util.*; public class CityController { @Autowired CityService cityService; - @Autowired +/* @Autowired AreaCommonService areaCommonService; - /** + *//** * 计算根据点集得出各城市的地理区域 * @return 返回区域面结果 * 备注:无 - */ + *//* @ApiOperation(value = "北京城市的点") @PostMapping("/polygon") public ResponseResult polygon() { @@ -91,7 +96,7 @@ public class CityController { } - } + }*/ /** * 判断某个点是否在一个面中 diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index d97c3b7..317280f 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -55,8 +55,6 @@ public class DataFileController { @Autowired DataMenuService dataMenuService; @Autowired - AdminUserService adminUserService; - @Autowired ZipFileService zipFileService; @Value("${upLoadPath}") String upLoadPath; diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java index e85c041..7c255b5 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataPlpController.java @@ -10,7 +10,6 @@ import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.DataFile; import com.cetc32.dh.entity.DataPlp; -import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.DataPlpService; import com.cetc32.webutil.common.util.SecurityUserUtil; import io.swagger.annotations.ApiImplicitParam; @@ -36,9 +35,6 @@ public class DataPlpController { @Autowired DataPlpService dataPlpService; - @Autowired - AdminUserService adminUserService; - /** * 提交点线面数据 * @@ -252,10 +248,7 @@ public class DataPlpController { int sum = 0; ids = (List) map.get("ids"); Integer userId = SecurityUserUtil.getUser().getId(); - String userName = null; - if ((adminUserService.getUserById(userId)) != null) { - userName = adminUserService.getUserById(userId).getSysUserName(); - } + String userName = SecurityUserUtil.getUser().getUsername(); for (int i = 0; i < ids.size(); i++) { Integer id = ids.get(i); if (dataPlpService.deleteById(id) > 0) { diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java index 14d3190..b62477f 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataTraceController.java @@ -10,7 +10,6 @@ import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.DataPlp; import com.cetc32.dh.entity.DataTrace; -import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.DataTraceService; import com.cetc32.dh.utils.FileUtil; import com.cetc32.webutil.common.util.SecurityUserUtil; @@ -43,9 +42,6 @@ public class DataTraceController { @Autowired DataTraceService dataTraceService; - @Autowired - AdminUserService adminUserService; - /** * 提交轨迹数据 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 ea8f2f9..b8e1f77 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -8,7 +8,6 @@ import com.cetc32.dh.dto.DemandSubmitDTO; import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.DemandSubmit; import com.cetc32.dh.entity.vDemand; -import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.DemandSubmitService; import com.cetc32.dh.utils.FileUtil; import com.cetc32.webutil.common.util.SecurityUserUtil; @@ -48,9 +47,6 @@ public class DemanSubmitController { @Autowired DemandSubmitService demandSubmitService; - @Autowired - AdminUserService adminUserService; - @Value("${myPath}") String myPath; @@ -171,10 +167,7 @@ public class DemanSubmitController { demandSubmit.setEndtime(date); String upCachePath=myPath+"_user"+userid; //BaseAdminUser adminUser=getCurrentUserId(); - String userName =null; - if((adminUserService.getUserById(userid))!=null){ - userName = adminUserService.getUserById(userid).getSysUserName(); - } + String userName =SecurityUserUtil.getUser().getUsername(); demandSubmit.setReporter(userName); String status="未审批"; Date d= new Date(); @@ -368,8 +361,8 @@ public class DemanSubmitController { */ @PostMapping("/getdemand") public PageDataResult getUserAll(){ - BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); - String name = adminUser.getSysUserName(); + //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); + String name = SecurityUserUtil.getUser().getUsername(); PageDataResult pdr = new PageDataResult(); pdr.setTotals(demandSubmitService.countMineSubmit(name)); pdr.setList(demandSubmitService.selectMySubmit(name)); diff --git a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java deleted file mode 100644 index c3111d3..0000000 --- a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.dto.CommonTreeDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.Department; -import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.service.impl.AdminUserServiceImpl; -import com.cetc32.dh.service.impl.DepartmentServiceImpl; -import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@RestController -@RequestMapping("/department/") -public class DepartmentController { - @Autowired - DepartmentServiceImpl departmentService; - - @Autowired - AdminUserServiceImpl userService; - - /** - *展示所有部门 - * @return PageDateResult - */ - @ApiOperation(value = "展示所有部门") - - @PostMapping("/options") - @ApiImplicitParams({ - @ApiImplicitParam(name="page",value = "页码",dataType = "Integer",defaultValue = "0"), - @ApiImplicitParam(name="results",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - }) - public PageDataResult departmentAll(@RequestBody NumberS number){ - List list=departmentService.findAll(number); - Integer count = departmentService.countDepartment(); - return new PageDataResult(count,list,number.getOffset()); - } - - @ApiOperation(value="组织机构树结构") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "查询ID（key值）下的范围树,非必填，默认查询全部", dataType = "Integer"), - }) - @RequestMapping(value = "/tree", method = RequestMethod.GET) - public ResponseResult departmentTree(Integer id) { - if (id ==null ){ - id = 1; - } - List commonTreeDTO = departmentService.getTreeList(id); - return ResponseResult.success(commonTreeDTO); - } - - /** - * 新增部门 - * @param department - * @return ResponseResult - */ - @ApiOperation(value = "新增部门") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id",defaultValue = "记录id号（不传参）", paramType = "body", dataType = "Integer", required = false), - @ApiImplicitParam(name = "name",defaultValue = "部门名称", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "description",defaultValue = "部门描述", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "organizationid",defaultValue = "组织id", paramType = "body", dataType = "Integer"), - }) - @PostMapping("/add") - public ResponseResult insertselect(@RequestBody Department department){ - if(department == null || StringUtils.isBlank(department.getName())){ - return ResponseResult.error("传入值不能为空！"); - } - if(departmentService.findByID(department.getOrganizationid())==null) - { - return ResponseResult.error("上级部门不存在！"); - } - department.setName(department.getName().trim()); - List dp=departmentService.findByParentID(department.getOrganizationid()); - List result1 = dp.stream() - .filter(item -> item.getName().equals(department.getName())) - .collect(Collectors.toList()); - if(result1.size()>0) - { - return ResponseResult.error("同级已存在重复名字！"); - } - if(departmentService.insert(department)>0){ - return ResponseResult.success("新增成功！"); - } - return ResponseResult.error("新增失败"); - } - - @ApiOperation(value = "删除部门") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id",defaultValue = "组织id", dataType = "Integer") - }) - @PostMapping("/delete") - public ResponseResult deleteById(@RequestBody Map delId){ - Integer id= delId.getOrDefault("id",null); - if(id==null){ - return ResponseResult.error("缺少参数：id"); - } - List dp=departmentService.findByParentID(id); - if(dp.size()>0) - { - return ResponseResult.error("请先删除子部门！"); - } - BaseAdminUser user_info=new BaseAdminUser(); - user_info.setDepartment(id); - if(userService.findUserByCondition(user_info).size()>0) - { - return ResponseResult.error("请先删除部门内人员！"); - } - if(departmentService.deleteById(id)>0){ - return ResponseResult.success("删除成功！"); - } - return ResponseResult.error("删除失败"); - } - @ApiOperation(value = "更新部门") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id",defaultValue = "记录id号", paramType = "body", dataType = "Integer"), - @ApiImplicitParam(name = "name",defaultValue = "部门名称", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "description",defaultValue = "部门描述", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "organizationid",defaultValue = "组织id", paramType = "body", dataType = "Integer"), - }) - @PostMapping("/update") - public ResponseResult updateselect(@RequestBody Department department){ - if(department == null || StringUtils.isBlank(department.getName())){ - return ResponseResult.error("name 不能为空！"); - } - departmentService.updateByPrimaryKeySelective(department); - return new ResponseResult("更新成功"); - } - -// @ApiOperation(value = "部门搜索") - @PostMapping("/search") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value = "页码",dataType = "Integer",defaultValue = "1"), - @ApiImplicitParam(name="pageSize",value = "每页数据条数",dataType = "Integer",defaultValue = "10"), - @ApiImplicitParam(name="keyword",value = "搜索的内容",dataType = "String",defaultValue = ""), - }) - public PageDataResult search(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) { -// BaseAdminUser user_info=CreateUser(userInfo); -// return new PageDataResult(userService.countUserByCondition(user_info), -// userService.findUserByCondition(user_info), -// user_info.getOffset()); - - if (pageNum == null || pageNum == 0) { - pageNum = 1; - } - if (pageSize == null || pageSize == 0) - pageSize = 10; - int count=0; - if(keyword==null || keyword.isEmpty()) - { - count=departmentService.countDepartment(); - } - else { - count=departmentService.findByKeyWord(keyword).size(); - } - List list=new ArrayList<>(); - PageHelper.startPage(pageNum, pageSize); - if(keyword==null || keyword.isEmpty()) - { - list=departmentService.getDepartmentList(); - } - else { - list=departmentService.findByKeyWord(keyword); - } - PageDataResult pdr = new PageDataResult(); - pdr.setTotals(count); - pdr.setList(list); - return pdr; - } - - - @RequestMapping("/selectbylimit") - public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum){ - PageDataResult pdr = new PageDataResult(); - if(pagenum == null || pagenum == 0){ - pagenum =1; - } - if (pagesize == null || pagesize == 0) - pagesize = 10; - pdr.setList(departmentService.selectByLimit((pagenum - 1) * pagesize, pagesize)); - pdr.setTotals(departmentService.countDepartment()); - return pdr; - } - - @RequestMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id){ - if(id == null){ - return ResponseResult.error("id为空！"); - } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.departmentService.selectByPrimaryKey(id)); - return pdr; - } - - @RequestMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ - if(id == null) - return ResponseResult.error("传入值为空！"); - departmentService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); - } - - -} 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 7e27e69..187525d 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java @@ -9,7 +9,6 @@ import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.DemandSubmit; import com.cetc32.dh.entity.EstimateTask; import com.cetc32.dh.entity.vEstimate; -import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.EstimateTaskService; import com.cetc32.dh.utils.FileUtil; import com.cetc32.webutil.common.util.SecurityUserUtil; @@ -41,9 +40,6 @@ public class EstimateTaskController { @Autowired EstimateTaskService estimateTaskService; - @Autowired - AdminUserService adminUserService; - @Value("${myPath}") String myPath; @@ -234,8 +230,8 @@ public class EstimateTaskController { @PostMapping("/gettask") public PageDataResult getUserTask(){ - BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); - String name = adminUser.getSysUserName(); + //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); + String name = SecurityUserUtil.getUser().getUsername(); PageDataResult pdr = new PageDataResult(); pdr.setTotals(estimateTaskService.countMineSubmit(name)); pdr.setList(estimateTaskService.selectMySubmit(name)); diff --git a/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java b/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java deleted file mode 100644 index 4553915..0000000 --- a/src/main/java/com/cetc32/dh/controller/rest/OrganizationController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.entity.Organization; -import com.cetc32.dh.service.OrganizationService; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/organization/") -public class OrganizationController { - @Autowired - OrganizationService organizationService; - - @RequestMapping("/options") - public PageDataResult organizationAll(){ - PageDataResult pdr = new PageDataResult(); - pdr.setTotals(organizationService.countOrganization()); - pdr.setList(organizationService.findAll()); - return pdr; - } - - @RequestMapping("/insertselect") - public ResponseResult insertselect(Organization organization){ - if(organization == null){ - return ResponseResult.error("传入值为空！"); - } - if(organizationService.insertSelectie(organization)>0){ - return new ResponseResult("Success"); - } - return ResponseResult.error("wrong"); - } - - @RequestMapping("/selectbylimit") - public PageDataResult selectbylimit(@RequestParam("pageSize") Integer pagesize, @RequestParam("pageNum") Integer pagenum){ - PageDataResult pdr = new PageDataResult(); - if(pagenum == null || pagenum == 0){ - pagenum =1; - } - if (pagesize == null || pagesize == 0) - pagesize = 10; - pdr.setList(organizationService.selectByLimit((pagenum - 1) * pagesize, pagesize)); - pdr.setTotals(organizationService.countOrganization()); - return pdr; - } - - @RequestMapping("/selectbykey") - public ResponseResult selsectbykey(Integer id){ - if(id == null){ - return ResponseResult.error("id为空！"); - } - ResponseResult pdr = new ResponseResult(); - pdr.setObj(this.organizationService.selectByPrimaryKey(id)); - return pdr; - } - - @RequestMapping("/deletebykey") - public ResponseResult deletebyprimarykey(Integer id){ - if(id == null) - return ResponseResult.error("传入值为空！"); - organizationService.deleteByPrimaryKey(id); - return new ResponseResult("Success"); - } - - @RequestMapping("/updateselect") - public ResponseResult updateselect(Organization record){ - if(record == null){ - return ResponseResult.error("传入值为空！"); - } - organizationService.updateByPrimaryKeySelective(record); - return new ResponseResult("Success"); - } - - @RequestMapping("/search") - public PageDataResult CircuitSearch(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String keyword) { - - PageDataResult pdr = new PageDataResult(); - if (pageNum == null || pageNum == 0) { - pageNum = 1; - } - if (pageSize == null || pageSize == 0) - pageSize = 10; - - pdr.setTotals(organizationService.findByKeyWord(keyword).size()); - PageHelper.startPage(pageNum, pageSize); - pdr.setList(organizationService.findByKeyWord(keyword)); - return pdr; - } -} 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 98d252e..1a87c72 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -7,7 +7,6 @@ import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.*; import com.cetc32.dh.service.*; -import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.utils.FileUtil; import com.cetc32.webutil.common.annotations.LoginSkipped; @@ -55,9 +54,6 @@ public class OtherInterfaceController { @Autowired DataPlpService dataPlpService; - @Autowired - AdminUserService adminUserService; - @Value("${upLoadPath}") String upLoadPath; diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java index b0670a4..892dfe5 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProductDemandController.java @@ -5,7 +5,6 @@ import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.dto.EditJsonDTO; import com.cetc32.dh.dto.ProductDTO; import com.cetc32.dh.entity.*; -import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.service.ProductdemandService; import com.cetc32.dh.utils.FileUtil; import com.cetc32.webutil.common.util.SecurityUserUtil; @@ -44,8 +43,6 @@ import java.util.*; public class ProductDemandController { @Autowired ProductdemandService productdemandService; - @Autowired - AdminUserService adminUserService; @Value("${myPath}") String myPath; @@ -277,8 +274,8 @@ public class ProductDemandController { */ @PostMapping("/getproduct") public PageDataResult getUserproduct() { - BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); - String name = adminUser.getSysUserName(); + //BaseAdminUser adminUser = adminUserService.queryById(SecurityUserUtil.getUser().getId()); + String name = SecurityUserUtil.getUser().getUsername(); PageDataResult pdr = new PageDataResult(); pdr.setTotals(productdemandService.countMineSubmit(name)); pdr.setList(productdemandService.selectMySubmit(name)); diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index b5d0fe4..e8f4dcc 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -7,9 +7,7 @@ import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.common.utils.DigestUtils; import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.entity.*; -import com.cetc32.dh.service.AreaCommonService; -import com.cetc32.dh.service.CityService; +import com.cetc32.dh.entity.*;import com.cetc32.dh.service.CityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java b/src/main/java/com/cetc32/dh/controller/system/PermissionController.java deleted file mode 100644 index 4539239..0000000 --- a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java +++ /dev/null @@ -1,154 +0,0 @@ -/** - * @Description: 权限管理 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.system; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.service.AdminPermissionService; -import org.apache.shiro.SecurityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Title: PermissionController - * @Description: 权限管理 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/29 18:16 - */ -@Controller -@RequestMapping("permission") -public class PermissionController { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminPermissionService permissionService; - - /** - * 功能描述: 跳到权限管理 - * @return: String - * @auther: youqing - * @date: 2018/11/30 9:22 - */ - @RequestMapping("permissionManage") - public String permissionManage() { - logger.info("进入权限管理"); - return "/permission/permissionManage"; - } - - /** - * 功能描述: 获取权限菜单列表 - * @param pageNum - * @param pageSize - * @return: PageDataResult - * @auther: youqing - * @date: 2018/11/30 10:30 - */ - @PostMapping("permissionList") - @ResponseBody - public PageDataResult permissionList(@RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize){ - logger.info("获取权限菜单列表"); - PageDataResult pdr = new PageDataResult(); - try { - if(null == pageNum) { - pageNum = 1; - } - if(null == pageSize) { - pageSize = 10; - } - // 获取服务类目列表 - pdr = permissionService.getPermissionList(pageNum ,pageSize); - logger.info("权限菜单列表查询=pdr:" + pdr); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("权限菜单列表查询异常！", e); - } - return pdr; - } - - /** - * 功能描述: 获取根权限菜单列表 - * @return: List - * @auther: youqing - * @date: 2018/11/30 11:35 - */ - @GetMapping("parentPermissionList") - @ResponseBody - public List parentPermissionList(){ - logger.info("获取根权限菜单列表"); - return permissionService.parentPermissionList(); - } - - /** - * 功能描述:设置权限[新增或更新] - * @param permission - * @return: Map - * @auther: youqing - * @date: 2018/11/30 9:42 - */ - @PostMapping("setPermission") - @ResponseBody - public Map setPermission(BaseAdminPermission permission) { - logger.info("设置权限[新增或更新]！permission:" + permission); - Map data = new HashMap(); - if(permission.getId() == null){ - //新增权限 - data = permissionService.addPermission(permission); - }else{ - //修改权限 - data = permissionService.updatePermission(permission); - } - return data; - } - - /** - * 功能描述: 删除权限菜单 - * @param id - * @return: Map - * @auther: youqing - * @date: 2018/11/30 12:02 - */ - @PostMapping("del") - @ResponseBody - public Map del(@RequestParam("id") Long id) { - logger.info("删除权限菜单！id:" + id); - Map data = new HashMap<>(); - //删除服务类目类型 - data = permissionService.del(id); - return data; - } - - /** - * 功能描述: 获取登陆用户的权限 - * @return: Map - * @auther: youqing - * @date: 2018/12/4 9:48 - */ - @GetMapping("getUserPerms") - @ResponseBody - public Map getUserPerms(){ - logger.info("获取登陆用户的权限"); - Map data = new HashMap<>(); - BaseAdminUser user = (BaseAdminUser) SecurityUtils.getSubject().getPrincipal(); - data = permissionService.getUserPerms(user); - return data; - } - -} diff --git a/src/main/java/com/cetc32/dh/controller/system/RoleController.java b/src/main/java/com/cetc32/dh/controller/system/RoleController.java deleted file mode 100644 index 84a41d4..0000000 --- a/src/main/java/com/cetc32/dh/controller/system/RoleController.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * @Description: 角色管理 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.system; - -import com.cetc32.dh.service.AdminRoleService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Title: RoleController - * @Description: 角色管理 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/21 13:43 - */ -@Controller -@RequestMapping("role") -public class RoleController { - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminRoleService adminRoleService; - - /** - * 跳转到角色管理 - * @return String - */ - @RequestMapping("/roleManage") - public String toPage() { - logger.info("进入角色管理"); - return "/role/roleManage"; - } - -// /** -// * 功能描述: 获取角色列表 -// * @param pageNum -// * @param pageSize -// * @return: PageDataResult -// * @auther: youqing -// * @date: 2018/11/21 14:29 -// */ -// @RequestMapping(value = "/getRoleList", method = RequestMethod.GET) -// @ResponseBody -// public PageDataResult getRoleList(@RequestParam("pageNum") Integer pageNum, -// @RequestParam("pageSize") Integer pageSize) { -// logger.info("获取角色列表"); -// PageDataResult pdr = new PageDataResult(); -// try { -// if(null == pageNum) { -// pageNum = 1; -// } -// if(null == pageSize) { -// pageSize = 10; -// } -// // 获取角色列表 -// pdr = adminRoleService.getRoleList(pageNum ,pageSize); -// logger.info("角色列表查询=pdr:" + pdr); -// -// } catch (Exception e) { -// e.printStackTrace(); -// logger.error("角色列表查询异常！", e); -// } -// return pdr; -// } -// -// /** -// * 功能描述: 获取角色列表 -// * @return: List -// * @auther: youqing -// * @date: 2018/12/3 13:22 -// */ -// @GetMapping("getRoles") -// @ResponseBody -// public List getRoles(){ -// logger.info("获取角色列表"); -// return adminRoleService.getRoles(); -// } -// -// /** -// *述: 设置角色[新增或更新] -// * @param role -// * @return: Map -// * @auther: youqing -// * @date: 2018/12/3 10:54 -// */ -// @PostMapping("setRole") -// @ResponseBody -// public Map setRole(BaseAdminRole role) { -// logger.info("设置角色[新增或更新]！role:" + role); -// Map data = new HashMap(); -// if(role.getId() == null){ -// //新增角色 -// data = adminRoleService.addRole(role); -// }else{ -// //修改角色 -// data = adminRoleService.updateRole(role); -// } -// return data; -// } -// -// -// /** -// * 功能描述: 删除/恢复角色 -// * @param id -// * @param status -// * @return: Map -// * @auther: youqing -// * @date: 2018/11/21 16:00 -// */ -// @PostMapping("updateRoleStatus") -// @ResponseBody -// public Map updateRoleStatus(@RequestParam("id") int id, @RequestParam("status") Integer status) { -// logger.info("删除/恢复角色！id:" + id+" status:"+status); -// Map data = new HashMap<>(); -// if(status == 0){ -// //删除角色 -// data = adminRoleService.delRole(id,status); -// }else{ -// //恢复角色 -// data = adminRoleService.recoverRole(id,status); -// } -// return data; -// } - -} diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java deleted file mode 100644 index 70069fe..0000000 --- a/src/main/java/com/cetc32/dh/controller/system/UserController.java +++ /dev/null @@ -1,272 +0,0 @@ -/** - * @Description: 用户控制 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.controller.system; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.LoginDTO; -import com.cetc32.dh.dto.UserSearchDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.service.AdminUserService; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.DisabledAccountException; -import org.apache.shiro.authc.UnknownAccountException; -import org.apache.shiro.authc.UsernamePasswordToken; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.subject.Subject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import java.util.HashMap; -import java.util.Map; - -/** - * @Title: UserController - * @Description: 系统用户管理 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/20 15:17 - */ -@Controller -@RequestMapping("user") -public class UserController { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private AdminUserService adminUserService; - - /** - * 功能描述: 登入系统 - * @param request - * @param loginDTO - * @param session - * @return:Map - * @auther: youqing - * @date: 2018/11/22 15:47 - */ - @RequestMapping("/login") - @ResponseBody - public Map login(HttpServletRequest request, LoginDTO loginDTO, HttpSession session){ - logger.info("进行登陆"); - Map data = new HashMap(); - // 使用 shiro 进行登录 - Subject subject = SecurityUtils.getSubject(); - String userName = loginDTO.getUsername().trim(); - String password = loginDTO.getPassword().trim(); - String rememberMe = loginDTO.getRememberMe(); - String host = request.getRemoteAddr(); - - //获取token - UsernamePasswordToken token = new UsernamePasswordToken(userName, password,host); - - // 设置 remenmberMe 的功能 - if (rememberMe != null && rememberMe.equals("on")) { - token.setRememberMe(true); - } - - try { - subject.login(token); - // 登录成功 - BaseAdminUser user = (BaseAdminUser) subject.getPrincipal(); - - session.setAttribute("user", user.getSysUserName()); - String tokens = request.getParameter("token"); - data.put("code",1); -// data.put("url","/view/experiment/list"); - //data.put("url","/desktop"); - data.put("message","登陆成功"); - data.put("token",token); - data.put("tokens",tokens); -// data.put("subject",subject); -// data.put("session",session); - logger.info(user.getSysUserName()+"登陆成功"); - } catch (UnknownAccountException e) { - data.put("code",0); - data.put("message",userName+"账号不存在"); - logger.error(userName+"账号不存在"); - return data; - }catch (DisabledAccountException e){ - data.put("code",0); - data.put("message",userName+"账号异常"); - logger.error(userName+"账号异常"); - return data; - } - catch (AuthenticationException e){ - data.put("code",0); - data.put("message",userName+"密码错误"); - logger.error(userName+"密码错误"); - return data; - } - - return data; - } - - /** - * 功能描述: 修改密码 - * @param pwd - * @param isPwd - * @return:Map - * @auther: youqing - * @date: 2018/11/22 17:26 - */ - @RequestMapping("setPwd") - @ResponseBody - public Map setP(String pwd, String isPwd){ - logger.info("进行密码重置"); - Map data = new HashMap(); - if(!pwd.equals(isPwd)){ - data.put("code",0); - data.put("message","两次输入的密码不一致!"); - logger.error("两次输入的密码不一致!"); - return data; - } - //获取当前登陆的用户信息 - BaseAdminUser user = (BaseAdminUser) SecurityUtils.getSubject().getPrincipal(); - int result = adminUserService.updatePwd(user.getSysUserName(),pwd); - if(result == 0){ - data.put("code",0); - data.put("msg","修改密码失败！"); - logger.error("用户修改密码失败！"); - return data; - } - data.put("code",1); - data.put("msg","修改密码成功！"); - logger.info("用户修改密码成功！"); - return data; - } - - /** - * 功能描述: 跳到系统用户列表 - * @return:String - * @auther: youqing - * @date: 2018/11/21 13:50 - */ - @RequestMapping("/userManage") - public String userManage() { - return "/user/userManage"; - } - - /** - * 功能描述: 分页查询用户列表 - * @param pageNum - * @param pageSize - * @param userSearch - * @return:PageDataResult - * @auther: youqing - * @date: 2018/11/21 11:10 - */ - @RequestMapping(value = "/getUserList", method = RequestMethod.POST) - @ResponseBody - public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize,/*@Valid PageRequest page,*/ UserSearchDTO userSearch) { - /*logger.info("分页查询用户列表！搜索条件：userSearch：" + userSearch + ",pageNum:" + page.getPageNum() - + ",每页记录数量pageSize:" + page.getPageSize());*/ - PageDataResult pdr = new PageDataResult(); - try { - if(null == pageNum) { - pageNum = 1; - } - if(null == pageSize) { - pageSize = 10; - } - // 获取用户列表 - pdr = adminUserService.getUserList(userSearch, pageNum ,pageSize); - logger.info("用户列表查询=pdr:" + pdr); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("用户列表查询异常！", e); - } - return pdr; - } - - /** - * 功能描述: 新增和更新系统用户 - * @param user - * @return:Map - * @auther: youqing - * @date: 2018/11/22 10:14 - */ - @RequestMapping(value = "/setUser", method = RequestMethod.POST) - @ResponseBody - public Map setUser(BaseAdminUser user) { - logger.info("设置用户[新增或更新]！user:" + user); - Map data = new HashMap(); - if(user.getId() == null){ - data = adminUserService.addUser(user); - }else{ - data = adminUserService.updateUser(user); - } - return data; - } - - - /** - * 功能描述: 删除/恢复 用户 - * @param id - * @param status - * @return:Map - * @auther: youqing - * @date: 2018/11/22 11:59 - */ - @RequestMapping(value = "/updateUserStatus", method = RequestMethod.POST) - @ResponseBody - public int updateUserStatus(@RequestParam("id") Integer id, @RequestParam("status") Integer status) { - logger.info("删除/恢复用户！id:" + id+" status:"+status); - int data=0; - if(status == 0){ - //删除用户 - data = adminUserService.delUser(id,status); - } -// else{ -// //恢复用户 -//// data = adminUserService.recoverUser(id,status); -// } - return data; - } - - /** - * 功能描述: 根据权限查询用户列表 - * @param pageNum - * @param pageSize - * @param roleId - * @return:PageDataResult - * @auther: hubin - * @date: 2020/10/23 - */ - @RequestMapping(value = "/getUserRole", method = RequestMethod.POST) - @ResponseBody - public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize,Integer roleId){ - PageDataResult pdr = new PageDataResult(); - try { - if(null == pageNum) { - pageNum = 1; - } - if(null == pageSize) { - pageSize = 10; - } - // 获取用户列表 - pdr = adminUserService.getUserRole(roleId, pageNum ,pageSize); - logger.info("用户列表查询=pdr:" + pdr); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("用户列表查询异常！", e); - } - return pdr; - } - -} diff --git a/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java b/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java deleted file mode 100644 index c9b039f..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.AreaCommonExample; -import com.cetc32.dh.entity.BaseAdminPermission; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mapper.MyMapper; -import tk.mybatis.mapper.common.Mapper; - -import java.util.List; -@Repository -public interface AreaCommonMapper extends MyMapper { - public Integer updateByCity(AreaCommon areaCommon); - public List selectAll(); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java deleted file mode 100644 index cb94e39..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminPermissionMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @Description: 用户权限数据库数据库实体操作 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mapper.MyMapper; -import java.util.List; - -/** - * @Title: BaseAdminPermissionMapper - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface BaseAdminPermissionMapper extends MyMapper { - - List getPermissionList(); - - List parentPermissionList(); - - int updatePermission(BaseAdminPermission permission); - - List getPermissionListByPId(@Param("pid") Integer pid); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java deleted file mode 100644 index 8e30d1b..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminRoleMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @Description: 用户角色管理实体操作 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.entity.NumberS; -import org.springframework.stereotype.Repository; -import tk.mapper.MyMapper; - -import java.util.List; -/** - * @Title: BaseAdminRoleMapper - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface BaseAdminRoleMapper extends MyMapper { - - List getAllRoles(NumberS number); - List getRoleList(); - ResultUserRole findRoleByID(Integer id); - int addRole(BaseAdminRole baseAdminRole); - ResultUserRole findRoleByName(String roleName); - int countRoles(); - int updateRole(BaseAdminRole baseAdminRole); - int delRoleByID(Integer id); - -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java deleted file mode 100644 index 534282a..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @Description: 用户管理数据库实体操作 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.beans.ResultUserInfo; -import com.cetc32.dh.beans.ResultUserInfoDe; -import com.cetc32.dh.dto.AdminUserDTO; -import com.cetc32.dh.dto.UserSearchDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mapper.MyMapper; -import java.util.List; - -/** - * @Title: BaseAdminUserMapper - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Repository -public interface BaseAdminUserMapper extends MyMapper { - - int insertUser(BaseAdminUser user); - - int deleteInfo(@Param("id") Integer id); - - List findUserByCondition(BaseAdminUser user); - - Integer countUserByCondition(BaseAdminUser user); - - List getUserList(UserSearchDTO userSearchDTO); - - BaseAdminUser getUserByUserName(@Param("sysUserName") String sysUserName, @Param("id") Integer id); - - int updateUserStatus(@Param("id") Integer id, @Param("status") Integer status); - - int updateUser(BaseAdminUser user); - - int countUserByCondition(@Param("offset") Integer offset, @Param("limit") Integer limit,@Param("user") BaseAdminUser user); - - BaseAdminUser findByUserName(@Param("userName") String userName); - - BaseAdminUser findByUserNameAll(@Param("userName") String userName); - - int updatePwd(@Param("userName") String userName, @Param("password") String password); - - List getUserRole(@Param("roleId") Integer roleId); - - BaseAdminUser queryById(Integer id); - -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java b/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java deleted file mode 100644 index 12d4441..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/DepartmentMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.Department; -import com.cetc32.dh.entity.NumberS; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; -import tk.mapper.MyMapper; - -import java.util.List; - -@Repository -public interface DepartmentMapper extends MyMapper { - List findall(NumberS number); - - List findByParentID(@Param("organizationid") Integer pid); - - Department findByID(Integer id); - - int deleteById(Integer id); - - List getDepartmentList(); - -// int deleteByPrimaryKey(Integer id); - - int insert(Department record); - - int insertSelective(Department record); - - List selectByLimit(@Param("offset") Integer offset, @Param("limit") Integer limit); - -// Department selectByPrimaryKey(Integer id); - - int countDepartment(); - - int updateByPrimaryKeySelective(Department record); - - int updateByPrimaryKey(Department record); - List findByKeyWord(String keyword); -} diff --git a/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java b/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java deleted file mode 100644 index 21e249a..0000000 --- a/src/main/java/com/cetc32/dh/mybatis/OrganizationMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cetc32.dh.mybatis; - -import com.cetc32.dh.entity.Organization; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface OrganizationMapper { - - List findall(); - - int deleteByPrimaryKey(Integer id); - - int insert(Organization record); - - int insertSelective(Organization record); - - List selectByLimit(@Param("offset") Integer offset,@Param("limit") Integer limit); - - Organization selectByPrimaryKey(Integer id); - - int countOrganization(); - - int updateByPrimaryKeySelective(Organization record); - - int updateByPrimaryKey(Organization record); - List findByKeyWord(String keyword); -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/AdminPermissionService.java b/src/main/java/com/cetc32/dh/service/AdminPermissionService.java deleted file mode 100644 index 915f0b3..0000000 --- a/src/main/java/com/cetc32/dh/service/AdminPermissionService.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @Description: 用户权限 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import java.util.List; -import java.util.Map; - -/** - * @Title: AdminPermissionService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/30 9:44 - */ -public interface AdminPermissionService { - - Map addPermission(BaseAdminPermission permission); - - Map updatePermission(BaseAdminPermission permission); - - PageDataResult getPermissionList(Integer pageNum, Integer pageSize); - - List parentPermissionList(); - - Map del(long id); - - BaseAdminPermission getById(Object id); - - Map getUserPerms(BaseAdminUser user); - -} diff --git a/src/main/java/com/cetc32/dh/service/AdminRoleService.java b/src/main/java/com/cetc32/dh/service/AdminRoleService.java deleted file mode 100644 index 608d28a..0000000 --- a/src/main/java/com/cetc32/dh/service/AdminRoleService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.cetc32.dh.service; -/** - * @Description: 用户角色管理接口 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.entity.NumberS; - -import java.util.List; - -/** - * @Title: AdminRoleService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 14:25 - */ -public interface AdminRoleService { - - List getAllRoles(NumberS number); - - List getRoleList(); - - ResultUserRole findRoleByName(String roleName); - - int countRoles(); - - ResultUserRole findRoleById(Integer id); - - int updateRole(BaseAdminRole baseAdminRole); - - int delRoleByID(Integer id); - - int addRole(BaseAdminRole baseAdminRole); - -} diff --git a/src/main/java/com/cetc32/dh/service/AdminUserService.java b/src/main/java/com/cetc32/dh/service/AdminUserService.java deleted file mode 100644 index eb60354..0000000 --- a/src/main/java/com/cetc32/dh/service/AdminUserService.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * @Description: 用户管理接口 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service; - -import com.cetc32.dh.beans.ResultUserInfo; -import com.cetc32.dh.beans.ResultUserInfoDe; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.dto.UserSearchDTO; -import com.cetc32.dh.entity.BaseAdminUser; - -import java.util.List; -import java.util.Map; - -/** - * @Title: AdminUserService - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:04 - */ -public interface AdminUserService { - - PageDataResult getUserList(UserSearchDTO userSearch, Integer pageNum, Integer pageSize); - - Map addUser(BaseAdminUser user); - - int insertUser(BaseAdminUser user); - - int deleteInfo(Integer id); - - int updateUserInfo(BaseAdminUser user); - List findUserByCondition(BaseAdminUser userInfo); - Integer countUserByCondition(BaseAdminUser user); - - Map updateUser(BaseAdminUser user); - - BaseAdminUser getUserById(Integer id); - - BaseAdminUser findByUserName(String userName); - - BaseAdminUser findByUserNameAll(String userName); - - int updatePwd(String userName, String password); - - int delUser(Integer id, Integer status); - - Map recoverUser(Integer id, Integer status); - - PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize); - - BaseAdminUser queryById(Integer id); -} diff --git a/src/main/java/com/cetc32/dh/service/AreaCommonService.java b/src/main/java/com/cetc32/dh/service/AreaCommonService.java deleted file mode 100644 index 8ed7bcf..0000000 --- a/src/main/java/com/cetc32/dh/service/AreaCommonService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cetc32.dh.service; - -import com.cetc32.dh.dto.CommonTreeDTO; -import com.cetc32.dh.entity.AreaCommon; - -import java.util.List; - -public interface AreaCommonService { - public List getAreasByIdList(List idList); - public List getAreaTreeList(String pid); - public List getAreaTreeByPid(String pid); - public AreaCommon getById(String id); - public Integer updateByCity(AreaCommon areaCommon); - public List selectAll(); -} diff --git a/src/main/java/com/cetc32/dh/service/DepartmentService.java b/src/main/java/com/cetc32/dh/service/DepartmentService.java deleted file mode 100644 index cd14c15..0000000 --- a/src/main/java/com/cetc32/dh/service/DepartmentService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cetc32.dh.service; - -import com.cetc32.dh.dto.CommonTreeDTO; -import com.cetc32.dh.entity.Department; -import com.cetc32.dh.entity.NumberS; -import com.google.inject.internal.util.$ImmutableList; - -import java.util.List; - -public interface DepartmentService { - - public List findAll(NumberS number); - public List getDepartmentList(); - public List findByParentID(Integer pid); - public Department findByID(Integer id); - public Integer deleteById(Integer id); - - public int deleteByPrimaryKey(Integer id); - public int insert(Department department); - public int insertSelective(Department department); - public Department selectByPrimaryKey(Integer id); - public List selectByLimit(Integer offset, Integer limit); - public int countDepartment(); - public int updateByPrimaryKeySelective(Department department); - public int updateByPrimaryKey(Department department); - public List findByKeyWord(String keyword); - public List getTreeList(Integer pid); -} diff --git a/src/main/java/com/cetc32/dh/service/OrganizationService.java b/src/main/java/com/cetc32/dh/service/OrganizationService.java deleted file mode 100644 index e041e72..0000000 --- a/src/main/java/com/cetc32/dh/service/OrganizationService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cetc32.dh.service; - -import com.cetc32.dh.entity.Organization; - -import java.util.List; - -public interface OrganizationService { - - public List findAll(); - - public int insert(Organization organization); - - public int insertSelectie(Organization organization); - - public Organization selectByPrimaryKey(Integer id); - - public List selectByLimit(Integer offset , Integer limit); - - public int countOrganization(); - - public int deleteByPrimaryKey(Integer id); - - public int updateByPrimaryKeySelective(Organization organization); - - public int updateByPrimaryKey(Organization organization); - - public List findByKeyWord(String keyword); - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java deleted file mode 100644 index 82f75db..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java +++ /dev/null @@ -1,210 +0,0 @@ -/** - * @Description: 用户权限接口实现 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.utils.DateUtils; -import com.cetc32.dh.dto.PermissionDTO; -import com.cetc32.dh.entity.BaseAdminPermission; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; -import com.cetc32.dh.mybatis.BaseAdminRoleMapper; -import com.cetc32.dh.service.AdminPermissionService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @Title: AdminPermissionServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/13 9:44 - */ -@Service -public class AdminPermissionServiceImpl implements AdminPermissionService { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private BaseAdminPermissionMapper permissionMapper; - - @Autowired - private BaseAdminRoleMapper roleMapper; - - /** - * 增加权限 - * @param permission - * @return Map - */ - @Override - public Map addPermission(BaseAdminPermission permission) { - Map data = new HashMap(); - try { - permission.setCreateTime(DateUtils.getCurrentDate()); - permission.setUpdateTime(DateUtils.getCurrentDate()); - permission.setDelFlag(1); - int result = permissionMapper.insert(permission); - if(result == 0){ - data.put("code",0); - data.put("msg","新增失败！"); - logger.error("权限[新增]，结果=新增失败！"); - return data; - } - data.put("code",1); - data.put("msg","新增成功！"); - logger.info("权限[新增]，结果=新增成功！"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("权限[新增]异常！", e); - return data; - } - return data; - } - - /** - * 更新权限 - * @param permission - * @return Map - */ - @Override - public Map updatePermission(BaseAdminPermission permission) { - Map data = new HashMap(); - try{ - permission.setUpdateTime(DateUtils.getCurrentDate()); - int result = permissionMapper.updatePermission(permission); - if(result == 0){ - data.put("code",0); - data.put("msg","更新失败！"); - logger.error("权限[更新]，结果=更新失败！"); - return data; - } - data.put("code",1); - data.put("msg","更新成功！"); - logger.info("权限[更新]，结果=更新成功！"); - }catch (Exception e) { - e.printStackTrace(); - logger.error("权限[更新]异常！", e); - return data; - } - return data; - } - - /** - * 获取权限列表 - * @param pageNum - * @param pageSize - * @return PageDataResult - */ - @Override - public PageDataResult getPermissionList(Integer pageNum, Integer pageSize) { - PageDataResult pageDataResult = new PageDataResult(); - PageHelper.startPage(pageNum, pageSize); - List permissions = permissionMapper.getPermissionList(); - - if(permissions.size() != 0){ - PageInfo pageInfo = new PageInfo<>(permissions); - pageDataResult.setList(permissions); - pageDataResult.setTotals((int) pageInfo.getTotal()); - } - return pageDataResult; - } - - /** - * 获取父类权限列表 - * @return List - */ - @Override - public List parentPermissionList() { - return permissionMapper.parentPermissionList(); - } - - /** - * 根据id删除权限 - * @param id - * @return Map - */ - @Override - public Map del(long id) { - Map data = new HashMap<>(); - try { - // 删除权限菜单 - int result = permissionMapper.deleteByPrimaryKey(id); - if(result == 0){ - data.put("code",0); - data.put("msg","删除失败"); - logger.error("删除失败"); - return data; - } - data.put("code",1); - data.put("msg","删除成功"); - logger.info("删除成功"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("删除权限菜单异常！", e); - } - return data; - } - - /** - * 根据id获取基本用户权限 - * @param id - * @return BaseAdminPermission - */ - @Override - public BaseAdminPermission getById(Object id) { - return permissionMapper.selectByPrimaryKey(id); - } - - /** - * 获取用户user的权限 - * @param user - * @return Map - */ - @Override - public Map getUserPerms(BaseAdminUser user) { - Map data = new HashMap<>(); - Set per = new HashSet(); - List roleId = Stream.of(user.getRoleId().split(",")).map(Integer::parseInt).collect(Collectors.toList()); - List rids=new ArrayList<>(); - for(Integer rid:roleId) - { -// Role role = roleMapper.selectByPrimaryKey(rid); -// String permissions = role.getPermissions(); -// rids.addAll(Arrays.asList(permissions.split(","))); - } - rids=rids.stream().distinct().collect(Collectors.toList()); - - if (rids.size()>0) { - List permissionList = new ArrayList <>(); - for (String id : rids) { - // 角色对应的权限数据 - BaseAdminPermission perm = permissionMapper.selectByPrimaryKey(id); - if (null != perm ) { - // 授权角色下所有权限 - PermissionDTO permissionDTO = new PermissionDTO(); - BeanUtils.copyProperties(perm,permissionDTO); - //获取子权限 - List childrens = permissionMapper.getPermissionListByPId(perm.getId()); - permissionDTO.setChildrens(childrens); - permissionList.add(permissionDTO); - } - } - data.put("perm",permissionList); - } - return data; - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java deleted file mode 100644 index 1fdb46f..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/AdminRoleServiceImpl.java +++ /dev/null @@ -1,128 +0,0 @@ -/** - * @Description: 用户角色管理接口实现 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.mybatis.BaseAdminPermissionMapper; -import com.cetc32.dh.mybatis.BaseAdminRoleMapper; -import com.cetc32.dh.service.AdminRoleService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Title: AdminRoleServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 14:26 - */ -@Service -public class AdminRoleServiceImpl implements AdminRoleService { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private BaseAdminRoleMapper baseAdminRoleMapper; - - @Autowired - private BaseAdminPermissionMapper baseAdminPermission; - - - /** - * 增加用户角色 - * @param baseAdminRole - * @return Map - */ - @Override - public int addRole(BaseAdminRole baseAdminRole) { - try { - return baseAdminRoleMapper.addRole(baseAdminRole); - } catch (Exception e) { - e.printStackTrace(); - logger.error("添加角色并授权！异常！", e); - return 0; - } - } - - /** - * 根据id查找用户角色 - * @param id - * @return BaseAdminRole - */ - @Override - public ResultUserRole findRoleById(Integer id) { - return baseAdminRoleMapper.findRoleByID(id); - } - - /** - * 更新用户角色 - * @param baseAdminRole - * @return Map - */ - @Override - public int updateRole(BaseAdminRole baseAdminRole) { - try{ - return baseAdminRoleMapper.updateRole(baseAdminRole); - }catch (Exception e) { - e.printStackTrace(); - logger.error("角色[更新]异常！", e); - return 0; - } - } - - /** - * 根据id和statu删除用户角色 - * @param id - */ - @Override - public int delRoleByID(Integer id) { - try { - return baseAdminRoleMapper.delRoleByID(id); - } catch (Exception e) { - e.printStackTrace(); - logger.error("删除角色异常！", e); - } - return 0; - } - - /** - * 获取所有用户角色列表 - * @return List - */ - @Override - public List getAllRoles(NumberS number) { - return baseAdminRoleMapper.getAllRoles(number); - } - - /** - * 获取所有用户角色列表 - * @return List - */ - @Override - public List getRoleList() { - return baseAdminRoleMapper.getRoleList(); - } - - - @Override - public ResultUserRole findRoleByName(String roleName) { - return baseAdminRoleMapper.findRoleByName(roleName); - } - - @Override - public int countRoles() - { - return baseAdminRoleMapper.countRoles(); - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java deleted file mode 100644 index 2ef75e7..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java +++ /dev/null @@ -1,379 +0,0 @@ -/** - * @Description: 用户管理接口实现 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.beans.ResultUserInfoDe; -import com.cetc32.dh.beans.ResultUserRole; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.common.response.PageDataResult; -import com.cetc32.dh.common.utils.DateUtils; -import com.cetc32.dh.common.utils.DigestUtils; -import com.cetc32.dh.dto.AdminUserDTO; -import com.cetc32.dh.dto.UserSearchDTO; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.Department; -import com.cetc32.dh.mybatis.AreaCommonMapper; -import com.cetc32.dh.mybatis.BaseAdminRoleMapper; -import com.cetc32.dh.mybatis.BaseAdminUserMapper; -import com.cetc32.dh.mybatis.DepartmentMapper; -import com.cetc32.dh.service.AdminUserService; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Title: AdminUserServiceImpl - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:04 - */ -@Service -public class AdminUserServiceImpl implements AdminUserService { - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - private BaseAdminUserMapper baseAdminUserMapper; - - @Autowired - private BaseAdminRoleMapper baseAdminRoleMapper; - @Autowired - private DepartmentMapper departmentMapper; - - @Autowired - private AreaCommonMapper areaCommonMapper; - - /** - * 获取用户列表 - * @param pageNum - * @param pageSize - * @param userSearch - * @return PageDataResult - */ - @Override - public PageDataResult getUserList(UserSearchDTO userSearch, Integer pageNum, Integer pageSize) { - PageDataResult pageDataResult = new PageDataResult(); - PageHelper.startPage(pageNum, pageSize); - List baseAdminUsers = baseAdminUserMapper.getUserList(userSearch); - - if(baseAdminUsers.size() != 0){ - PageInfo pageInfo = new PageInfo<>(baseAdminUsers); - pageDataResult.setList(baseAdminUsers); - pageDataResult.setTotals((int) pageInfo.getTotal()); - } - - return pageDataResult; - } - - @Override - public int insertUser(BaseAdminUser user) - { - return baseAdminUserMapper.insertUser(user); - } - /** - * 增加用户 - * @param user - * @return Map - */ - @Override - public Map addUser(BaseAdminUser user) { - Map data = new HashMap(); - try { - BaseAdminUser old = baseAdminUserMapper.getUserByUserName(user.getSysUserName(),null); - if(old != null){ - data.put("code",0); - data.put("msg","用户名已存在！"); - logger.error("用户[新增]，结果=用户名已存在！"); - return data; - } - String phone = user.getUserPhone(); - if(phone.length() != 11){ - data.put("code",0); - data.put("msg","手机号位数不对！"); - logger.error("置用户[新增或更新]，结果=手机号位数不对！"); - return data; - } - String username = user.getSysUserName(); - if(user.getSysUserPwd() == null){ - String password = DigestUtils.Md5(username,"123456"); - user.setSysUserPwd(password); - }else{ - String password = DigestUtils.Md5(username,user.getSysUserPwd()); - user.setSysUserPwd(password); - } - user.setRegTime(new Date() ); - user.setUserStatus(1); - int result = baseAdminUserMapper.insert(user); - if(result == 0){ - data.put("code",0); - data.put("msg","新增失败！"); - logger.error("用户[新增]，结果=新增失败！"); - return data; - } - data.put("code",1); - data.put("msg","新增成功！"); - logger.info("用户[新增]，结果=新增成功！"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("用户[新增]异常！", e); - return data; - } - return data; - } - - @Override - public List findUserByCondition(BaseAdminUser user) - { -// BaseAdminUser user=new BaseAdminUser(); -// user.setAreacode(userInfo.getAreacode()); -// user.setRoleId(userInfo.getRole()); -// user.setSysUserName(userInfo.getUsername()); -// user.setSecurity(userInfo.getSecurity()); -// user.setDepartment(userInfo.getDepartment()); -// user.setPage(userInfo.getPage()); -// user.setResults(userInfo.getResults()); - List users=baseAdminUserMapper.findUserByCondition(user); - List baseAdminRoles =baseAdminRoleMapper.getRoleList(); - List departments = departmentMapper.getDepartmentList(); - List areaCommons = areaCommonMapper.selectAll(); - - Map roleMap= baseAdminRoles.stream().collect(Collectors.toMap(ResultUserRole::getId, ResultUserRole::getRoleName)); - Map departmentsMap = - departments.stream().collect(Collectors.toMap(Department::getId, Department::getName)); - - Map areaCommonsMap = - areaCommons.stream().collect(Collectors.toMap(AreaCommon::getId, AreaCommon::getName)); - - for(ResultUserInfoDe ru:users) - { - List roleNames=new ArrayList<>(); - List areaCodeName=new ArrayList<>(); - List departmentName=new ArrayList<>(); - if(ru.getRole()!=null) - { - for(Integer i:ru.getRole()) - { - roleNames.add(roleMap.getOrDefault(i, "#已删除#")); - } - } - if(ru.getAreacode()!=null) - { - for(String i:ru.getAreacode()) - { - areaCodeName.add(areaCommonsMap.getOrDefault(i, "#已删除#")); - } - } - if(ru.getDepartment()!=null) - { - for(Integer i:ru.getDepartment()) - { - departmentName.add(departmentsMap.getOrDefault(i, "#已删除#")); - } - } - ru.setRoleName(roleNames); - ru.setAreaCodeName(areaCodeName); - ru.setDepartmentName(departmentName); - } - return users; - } - - @Override - public Integer countUserByCondition(BaseAdminUser user){ -// BaseAdminUser user=new BaseAdminUser(); -// user.setAreacode(userInfo.getAreacode()); -// user.setRoleId(userInfo.getRole()); -// user.setSysUserName(userInfo.getUsername()); -// user.setSecurity(userInfo.getSecurity()); -// user.setDepartment(userInfo.getDepartment()); -// user.setPage(userInfo.getPage()); -// user.setResults(userInfo.getResults()); - - return baseAdminUserMapper.countUserByCondition(user); - } - @Override - public int updateUserInfo(BaseAdminUser user) - { - return baseAdminUserMapper.updateUser(user); - } - /** - * 更新用户 - * @param user - * @return Map - */ - @Override - public Map updateUser(BaseAdminUser user) { - Map data = new HashMap(); - Integer id = user.getId(); - BaseAdminUser old = baseAdminUserMapper.getUserByUserName(user.getSysUserName(),id); - if(old != null){ - data.put("code",0); - data.put("msg","用户名已存在！"); - logger.error("用户[更新]，结果=用户名已存在！"); - return data; - } - String username = user.getSysUserName(); - if(user.getSysUserPwd() != null){ - String password = DigestUtils.Md5(username,user.getSysUserPwd()); - user.setSysUserPwd(password); - } - - int result = baseAdminUserMapper.updateUser(user); - if(result == 0){ - data.put("code",0); - data.put("msg","更新失败！"); - logger.error("用户[更新]，结果=更新失败！"); - return data; - } - data.put("code",1); - data.put("msg","更新成功！"); - logger.info("用户[更新]，结果=更新成功！"); - return data; - } - - /** - * 根据id获取用户 - * @param id - * @return BaseAdminUser - */ - @Override - public BaseAdminUser getUserById(Integer id) { - return baseAdminUserMapper.queryById(id); - } - - /** - * 根据id和status删除用户 - * @param id - * @param status - * @return Map - */ - @Override - public int delUser(Integer id,Integer status) { - try { - // 删除用户 - return baseAdminUserMapper.updateUserStatus(id,status); - - } catch (Exception e) { - e.printStackTrace(); - logger.error("删除用户异常！", e); - } - return 0; - } - /** - * 真正从数据库中删除用户（不可恢复） - * @param id - * @return id - */ - @Override - public int deleteInfo(Integer id) { - try { - // 删除用户 - return baseAdminUserMapper.deleteInfo(id); - } catch (Exception e) { - e.printStackTrace(); - logger.error("删除用户异常！", e); - } - return 0; - } - - /** - * 根据id和status恢复用户 - * @param id - * @param status - * @return Map - */ - @Override - public Map recoverUser(Integer id, Integer status) { - Map data = new HashMap<>(); - try { - int result = baseAdminUserMapper.updateUserStatus(id,status); - if(result == 0){ - data.put("code",0); - data.put("msg","恢复用户失败"); - } - data.put("code",1); - data.put("msg","恢复用户成功"); - } catch (Exception e) { - e.printStackTrace(); - logger.error("恢复用户异常！", e); - } - return data; - } - - /** - * 根据用户名字查找用户（仅查找已激活的有效用户） - * @param userName - * @return BaseAdminUser - */ - @Override - public BaseAdminUser findByUserName(String userName) { - return baseAdminUserMapper.findByUserName(userName); - } - /** - * 根据用户名字查找用户(不论是否删除) - * @param userName - * @return BaseAdminUser - */ - @Override - public BaseAdminUser findByUserNameAll(String userName) { - return baseAdminUserMapper.findByUserNameAll(userName); - } - - /** - * 更新用户密码 - * @param userName - * @param password - * @return int - */ - @Override - public int updatePwd(String userName, String password) { - password = DigestUtils.Md5(userName,password); - return baseAdminUserMapper.updatePwd(userName,password); - } - - - /** - * 根据权限查询用户 - * @param roleId - * @param pageNum - * @param pageSize - * @return PageDataResult - */ - @Override - public PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize){ - PageDataResult pageDataResult = new PageDataResult(); - PageHelper.startPage(pageNum, pageSize); - List baseAdminUsers = baseAdminUserMapper.getUserRole(roleId); - - if(baseAdminUsers.size() != 0){ - PageInfo pageInfo = new PageInfo<>(baseAdminUsers); - pageDataResult.setList(baseAdminUsers); - pageDataResult.setTotals((int) pageInfo.getTotal()); - } - - return pageDataResult; - } - - /** - * 根据用户id查询用户 - * @param id - * @return BaseAdminUser用户 - */ - @Override - public BaseAdminUser queryById(Integer id){ - return baseAdminUserMapper.queryById(id); - } -} - diff --git a/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java deleted file mode 100644 index ffc7aa5..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/AreaCommonServiceImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.dto.CommonTreeDTO; -import com.cetc32.dh.entity.AreaCommon; -import com.cetc32.dh.entity.AreaCommonExample; -import com.cetc32.dh.mybatis.AreaCommonMapper; -import com.cetc32.dh.service.AreaCommonService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class AreaCommonServiceImpl implements AreaCommonService { - - @Autowired - public AreaCommonMapper areaCommonMapper; - - - @Override - public List getAreasByIdList(List idList) { - AreaCommonExample areaCommonExample = new AreaCommonExample(); - AreaCommonExample.Criteria criteria= areaCommonExample.createCriteria(); - criteria.andIdIn(idList); - List list = areaCommonMapper.selectByExample(areaCommonExample); - return list; - } - - - - @Override - public List getAreaTreeByPid(String pid) { - AreaCommonExample areaCommonExample = new AreaCommonExample(); - AreaCommonExample.Criteria criteria= areaCommonExample.createCriteria(); - criteria.andParentIdEqualTo(pid); - List list = areaCommonMapper.selectByExample(areaCommonExample); - return list; - } - - @Override - public AreaCommon getById(String id) { - System.out.println("tree id:"+id); - return areaCommonMapper.selectByPrimaryKey(id); - } - - @Override - public Integer updateByCity(AreaCommon areaCommon) { - return areaCommonMapper.updateByCity(areaCommon); - } - - @Override - public List selectAll() { - return areaCommonMapper.selectAll(); - } - - - /** - * 递归获取地区树 - * HZJ - * @param pid - * @return - */ - @Override - public List getAreaTreeList(String pid) { -// return getTreeList(pid); -// ArrayList areaCommonDTOList = new ArrayList(); -// List childList = getAreaTreeByPid(pid); -// if(childList!=null&&childList.size()>0){ -// -// for(AreaCommon areaCommon:childList){ -// AreaCommonDTO areaCommonDTO = new AreaCommonDTO(); -// List ls = getAreaTreeList(areaCommon.getId()); -// areaCommonDTO.setKey(areaCommon.getId()); -// areaCommonDTO.setValue(areaCommon.getName()); -// areaCommonDTO.setTitle(areaCommon.getName()); -// if(ls == null){ -// -// }else { -// areaCommonDTO.setChildren(ls); -// } -// areaCommonDTOList.add(areaCommonDTO); -// } -// -// }else { -// return null; -// } -// return areaCommonDTOList; -// } - -// public List getTreeList(String pid) { - - ArrayList commonDTOList = new ArrayList(); - List all=areaCommonMapper.selectAll(); - AreaCommon rootTree = getById(pid); - if(rootTree!=null){ - CommonTreeDTO current=new CommonTreeDTO(rootTree.getName(),rootTree.getName(),rootTree.getId()); - findAllChild(current,all); - commonDTOList.add(current); - - }else { - return null; - } - return commonDTOList.get(0).getChildren(); - } - - private void findAllChild(CommonTreeDTO parrent, List all) { - List ls = new ArrayList<>(); - List result1 = all.stream() - .filter(item -> item.getParentId().equals(parrent.getKey())) - .collect(Collectors.toList()); - for (AreaCommon department:result1) - { - CommonTreeDTO current=new CommonTreeDTO(department.getName(),department.getName(),department.getId()); - findAllChild(current,all); - ls.add(current); - } - if(ls.size()>0){ - parrent.setChildren(ls); - } - } - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java deleted file mode 100644 index 9bd6fca..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/DepartmentServiceImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.dto.CommonTreeDTO; -import com.cetc32.dh.entity.Department; -import com.cetc32.dh.entity.NumberS; -import com.cetc32.dh.mybatis.DepartmentMapper; -import com.cetc32.dh.service.DepartmentService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class DepartmentServiceImpl implements DepartmentService { - @Autowired - DepartmentMapper departmentMapper; - - public List findAll(NumberS number) {return departmentMapper.findall(number);} - - @Override - public List getDepartmentList() { - return departmentMapper.getDepartmentList(); - } - - @Override - public List findByParentID(Integer pid) { - return departmentMapper.findByParentID(pid); - } - - @Override - public Department findByID(Integer id) { - return departmentMapper.findByID(id); - } - - @Override - public Integer deleteById(Integer id) { - return departmentMapper.deleteById(id); - } - - - public int deleteByPrimaryKey(Integer id){ - if(id==null) - return -1; - return departmentMapper.deleteByPrimaryKey(id); - } - - public int insert(Department department){ - return departmentMapper.insert(department); - } - - public int insertSelective(Department department){ - return departmentMapper.insertSelective(department); - } - - public Department selectByPrimaryKey(Integer id){ - if(id==null) - return null; - return departmentMapper.selectByPrimaryKey(id); - } - - public List selectByLimit(Integer offset, Integer limit){ - return departmentMapper.selectByLimit(offset, limit); - } - - public int countDepartment() {return departmentMapper.countDepartment();} - - public int updateByPrimaryKeySelective(Department department) { - return departmentMapper.updateByPrimaryKeySelective(department); - } - - public int updateByPrimaryKey(Department department){ - return departmentMapper.updateByPrimaryKey(department); - } - - public List findByKeyWord(String keyword){ - keyword = "%" + keyword + "%"; - List search = departmentMapper.findByKeyWord(keyword); - return search; - } - - /** - * 递归获取地区树 - * HZJ - * @param pid - * @return - */ - @Override - public List getTreeList(Integer pid) { - - ArrayList commonDTOList = new ArrayList(); - List all=departmentMapper.getDepartmentList(); - Department rootTree = findByID(pid); - if(rootTree!=null){ - CommonTreeDTO current=new CommonTreeDTO(rootTree.getName(),rootTree.getId(),rootTree.getId()); - findAllChild(current,all); - commonDTOList.add(current); - return commonDTOList.get(0).getChildren(); - - }else { - return null; - } - - } - - private void findAllChild(CommonTreeDTO parrent, List all) { - List ls = new ArrayList<>(); - List result1 = all.stream() - .filter(item -> item.getOrganizationid().equals(parrent.getKey())) - .collect(Collectors.toList()); - for (Department department:result1) - { - CommonTreeDTO current=new CommonTreeDTO(department.getName(),department.getId(),department.getId()); - findAllChild(current,all); - ls.add(current); - } - if(ls.size()>0){ - parrent.setChildren(ls); - } - } - -} diff --git a/src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java deleted file mode 100644 index ffc6ff9..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/OrganizationServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.entity.Organization; -import com.cetc32.dh.mybatis.OrganizationMapper; -import com.cetc32.dh.service.OrganizationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class OrganizationServiceImpl implements OrganizationService { - @Autowired - OrganizationMapper organizationMapper; - - public List findAll(){ return organizationMapper.findall();} - - public int insertSelectie(Organization organization){ - return organizationMapper.insertSelective(organization); - } - - public Organization selectByPrimaryKey(Integer id){ - if(id==null) - return null; - return organizationMapper.selectByPrimaryKey(id); - } - - public List selectByLimit(Integer offset , Integer limit){ - return organizationMapper.selectByLimit(offset,limit); - } - - public int countOrganization(){ - return organizationMapper.countOrganization(); - } - - public int deleteByPrimaryKey(Integer id){ - if(id==null) - return -1; - return organizationMapper.deleteByPrimaryKey(id); - } - - public int updateByPrimaryKeySelective(Organization organization){ - return organizationMapper.updateByPrimaryKeySelective(organization); - } - - public int updateByPrimaryKey(Organization organization){ - return organizationMapper.updateByPrimaryKey(organization); - } - - public List findByKeyWord(String keyword){ - keyword="%"+keyword+"%"; - List search=organizationMapper.findByKeyWord(keyword); - return search; - } - - @Override - public int insert(Organization organization){ - return organizationMapper.insert(organization); - } -} - 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 920e7d3..99d8db2 100644 --- a/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java @@ -6,7 +6,6 @@ import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.Productdemand; import com.cetc32.dh.entity.vProduct; import com.cetc32.dh.mybatis.ProductdemandMapper; -import com.cetc32.dh.service.AreaCommonService; import com.cetc32.dh.service.ProductdemandService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,8 +19,7 @@ import java.util.Map; public class ProductdemandServiceImpl implements ProductdemandService { @Autowired ProductdemandMapper productdemandMapper; - @Autowired - AreaCommonService areaCommonService; + public List findAll() { return productdemandMapper.findAll();} diff --git a/src/main/resources/mapper/AreaCommonMapper.xml b/src/main/resources/mapper/AreaCommonMapper.xml deleted file mode 100644 index 05147fe..0000000 --- a/src/main/resources/mapper/AreaCommonMapper.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - update area_common - - - - - geom = ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326), - - - name = #{name,jdbcType=VARCHAR}, - - - - - - where id = #{id,jdbcType=VARCHAR} - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/BaseAdminPermissionMapper.xml b/src/main/resources/mapper/BaseAdminPermissionMapper.xml deleted file mode 100644 index f9e68b8..0000000 --- a/src/main/resources/mapper/BaseAdminPermissionMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - UPDATE base_admin_permission - - - name = #{name}, - - - pid = #{pid}, - - - descpt = #{descpt}, - - - url = #{url}, - - - update_time = #{updateTime} - - - WHERE id = #{id} - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/BaseAdminRoleMapper.xml b/src/main/resources/mapper/BaseAdminRoleMapper.xml deleted file mode 100644 index c859562..0000000 --- a/src/main/resources/mapper/BaseAdminRoleMapper.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - id,system_menu,role_name,description,is_default - - - - - UPDATE base_admin_role - SET - - role_name = #{roleName} , - system_menu = #{systemMenu} , - description = #{description}, - - where - id = #{id} - - - - - - - - - - - - - - - DELETE FROM base_admin_role - WHERE id=#{id} - - - - insert into base_admin_role - - - role_name, - - - system_menu, - - - description, - - is_default - - - - #{roleName,jdbcType=VARCHAR}, - - - #{systemMenu,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - 0 - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml deleted file mode 100644 index cf8ed68..0000000 --- a/src/main/resources/mapper/BaseAdminUserMapper.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - id,sys_user_name,sys_user_pwd,user_status,reg_time,user_phone,role_id,areacode,security,department, web_login_count, web_login_status, web_login_time, app_login_status, - app_login_time, app_login_count, loginfailed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE base_admin_user - - - sys_user_name = #{sysUserName}, - - - sys_user_pwd = #{sysUserPwd}, - - - security = #{security}, - - - user_status = #{userStatus}, - - - role_id = #{roleId}, - - - user_phone = #{userPhone}, - - areacode = #{areacode}, - - - department = #{department} - - - - WHERE id = #{id} - - - - UPDATE base_admin_user - set sys_user_pwd = #{password} - where sys_user_name = #{userName} - - - - UPDATE base_admin_user - SET user_status = #{status} - WHERE id = #{id} - - - - - - - - - - - DELETE from base_admin_user where id = #{id} - - - - - - - - - - - - insert into base_admin_user - - - sys_user_name, - - - sys_user_pwd, - - - user_status, - - - reg_time, - - - user_phone, - - - role_id, - - - areacode, - - - security, - - - department, - - - - - #{sysUserName}, - - - #{sysUserPwd}, - - - #{userStatus}, - - - #{regTime}, - - - #{userPhone}, - - - #{roleId}, - - - #{areacode}, - - - #{security}, - - - #{department}, - - - - - - - - - - diff --git a/src/main/resources/mapper/DepartmentMapper.xml b/src/main/resources/mapper/DepartmentMapper.xml deleted file mode 100644 index 242599f..0000000 --- a/src/main/resources/mapper/DepartmentMapper.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - id, name,description,organizationid - - - - - - - - - - - - - - - - - - delete from department WHERE id =#{id} - - - - - - - - - - - - - - - insert into department - - - name, - - - description, - - - organizationid, - - - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{organizationid,jdbcType=INTEGER}, - - - - - - insert into department - - - id, - - - name, - - - description, - - - organizationid, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{organizationid,jdbcType=INTEGER}, - - - - - - update department - - - name = #{name,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - organizationid = #{organizationid,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - - - update department - set name = #{name,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - organizationid = #{organizationid,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml deleted file mode 100644 index f7be181..0000000 --- a/src/main/resources/mapper/OrganizationMapper.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - id, name,description - - - - - - - - - - - - - delete from organization - where id = #{id,jdbcType=INTEGER} - - - insert into organization (id, name, description - ) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR} - ) - - - insert into organization - - - id, - - - name, - - - description, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - - - update organization - - - name = #{name,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update organization - set name = #{name,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file -- Gitee From fdb603e30602bf25718605ee6461f7eaab6c6ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=8C=E5=93=A5=E5=9C=A8=E4=B8=8A=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E9=80=80=E6=95=A3=EF=BC=8C=E6=80=A5=E6=80=A5=E5=A6=82?= =?UTF-8?q?=E5=BE=8B=E4=BB=A4=EF=BC=81?= <393696201@qq.com> Date: Tue, 14 Sep 2021 14:34:03 +0800 Subject: [PATCH 34/45] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=80=82=E7=94=A8=E4=BA=8Ewindows=E5=8F=8ABase64=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/OtherInterfaceController.java | 6 +- src/main/resources/application-hubinwin.yml | 59 +++++++++++-------- 2 files changed, 36 insertions(+), 29 deletions(-) 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 1418988..d8d46c3 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -12,7 +12,6 @@ import com.cetc32.dh.service.AdminUserService; import com.cetc32.dh.utils.FileUtil; import com.cetc32.webutil.common.annotations.LoginSkipped; import com.cetc32.webutil.common.util.SecurityUserUtil; -import com.mysql.cj.util.Base64Decoder; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; @@ -27,6 +26,7 @@ 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; @@ -357,8 +357,8 @@ public class OtherInterfaceController { //因为BASE64Decoder的jar问题，此处使用spring框架提供的工具包 - Base64Decoder decoder = new Base64Decoder(); - byte[] bytes = decoder.decode(datab.getBytes(),0, datab.length()); //将base64转换成字节流 + Base64.Decoder decoder = Base64.getDecoder(); + byte[] bytes = decoder.decode(datab.getBytes()); //将base64转换成字节流 try{ //使用apache提供的工具类操作流 if(method !=null && obj !=null) diff --git a/src/main/resources/application-hubinwin.yml b/src/main/resources/application-hubinwin.yml index 4f5a0ec..e4a2667 100644 --- a/src/main/resources/application-hubinwin.yml +++ b/src/main/resources/application-hubinwin.yml @@ -25,35 +25,35 @@ spring: application: name: dhManager datasource: - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://localhost: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 + # 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会为我们自动转化 + 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 @@ -65,17 +65,24 @@ logging: level: com.cetc32.dh.mybatis: debug -storePath: D:\root -upLoadPath: ${storePath}\upLoad -upDatePath: ${storePath}\upDate -downPath: ${storePath}\Down +storePath: D:\daohang\ +upLoadPath: ${storePath}upLoad rootPath: D:\root\daohang\data -myPath: ${rootPath}\myPath\ +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 - +upDatePath: ${rootPath}\updatePath +downPath: ${rootPath}\downPath +eip: http://localhost:8080/ +sso: + authcenter: http://localhost:8087 + verifyUrl: ${sso.authcenter}/rest/auth/verify?token= + passportUrl: ${sso.authcenter}/?ReturnUrl= + defaultLoginRequiredEnable: true + permission: S002^*数据管理@/**;数据员@/rest/**; + #permission: S001^*业务管理@/**;普通用户@/rest/**; + sysurl : http://localhost:${server.port} + sysname : 数据管理系统 + registerUrl : ${sso.authcenter}/rest/api/sys/sync +offlineDataMenuId : 152 -- Gitee From f130aaf1a9d59c3ad2a3a44360326461aaa687f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Tue, 14 Sep 2021 16:42:48 +0800 Subject: [PATCH 35/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cetc32/dh/beans/LoginResult.java | 118 --- .../cetc32/dh/beans/ResultDataCollected.java | 76 -- .../com/cetc32/dh/beans/ResultUserInfo.java | 207 ---- .../com/cetc32/dh/beans/ResultUserInfoDe.java | 36 - .../com/cetc32/dh/beans/ResultUserRole.java | 88 -- .../cetc32/dh/common/filter/FormFilter.java | 64 -- .../cetc32/dh/common/filter/JWTFilter.java | 201 ---- .../common/filter/KickoutSessionFilter.java | 239 ----- .../com/cetc32/dh/common/utils/JWTUtil.java | 115 --- .../dh/common/utils/ShiroFilterUtils.java | 79 -- .../java/com/cetc32/dh/config/JWTToken.java | 35 - .../com/cetc32/dh/config/RedisConfig.java | 4 +- .../java/com/cetc32/dh/config/RedisUtil.java | 6 +- .../rest/DemanSubmitController.java | 1 - .../rest/EstimateTaskController.java | 2 - .../rest/OtherInterfaceController.java | 12 +- .../rest/ProvinceGeomController.java | 8 +- .../java/com/cetc32/dh/dto/AreaCommonDTO.java | 1 - .../java/com/cetc32/dh/entity/AreaCommon.java | 209 ---- .../cetc32/dh/entity/AreaCommonExample.java | 900 ------------------ .../cetc32/dh/entity/BaseAdminPermission.java | 208 ---- .../com/cetc32/dh/entity/BaseAdminRole.java | 107 --- .../com/cetc32/dh/entity/BaseAdminUser.java | 508 ---------- .../java/com/cetc32/dh/entity/Department.java | 39 - .../com/cetc32/dh/entity/Organization.java | 33 - .../cetc32/dh/mybatis/ProvinceGeomMapper.java | 1 - .../impl/ProductdemandServiceImpl.java | 1 - src/main/resources/application.yml | 3 - .../resources/mapper/EstimateTaskMapper.xml | 4 +- 29 files changed, 15 insertions(+), 3290 deletions(-) delete mode 100644 src/main/java/com/cetc32/dh/beans/LoginResult.java delete mode 100644 src/main/java/com/cetc32/dh/beans/ResultDataCollected.java delete mode 100644 src/main/java/com/cetc32/dh/beans/ResultUserInfo.java delete mode 100644 src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java delete mode 100644 src/main/java/com/cetc32/dh/beans/ResultUserRole.java delete mode 100644 src/main/java/com/cetc32/dh/common/filter/FormFilter.java delete mode 100644 src/main/java/com/cetc32/dh/common/filter/JWTFilter.java delete mode 100644 src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java delete mode 100644 src/main/java/com/cetc32/dh/common/utils/JWTUtil.java delete mode 100644 src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java delete mode 100644 src/main/java/com/cetc32/dh/config/JWTToken.java delete mode 100644 src/main/java/com/cetc32/dh/entity/AreaCommon.java delete mode 100644 src/main/java/com/cetc32/dh/entity/AreaCommonExample.java delete mode 100644 src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java delete mode 100644 src/main/java/com/cetc32/dh/entity/BaseAdminRole.java delete mode 100644 src/main/java/com/cetc32/dh/entity/BaseAdminUser.java delete mode 100644 src/main/java/com/cetc32/dh/entity/Department.java delete mode 100644 src/main/java/com/cetc32/dh/entity/Organization.java delete mode 100644 src/main/resources/application.yml diff --git a/src/main/java/com/cetc32/dh/beans/LoginResult.java b/src/main/java/com/cetc32/dh/beans/LoginResult.java deleted file mode 100644 index 77a081a..0000000 --- a/src/main/java/com/cetc32/dh/beans/LoginResult.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.cetc32.dh.beans; - -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class LoginResult { - private String token; - private List department; - private String username; - private Integer userid; - private List role; - private int security; - private List areacode; - private long expriation; - - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } - - public void setExpriation(long expriation) { - this.expriation = expriation; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public List getDepartment() { - return department; - } - - public void setDepartment(List department) { - this.department = department; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public List getRole() { - return role; - } - - public void setRole(List role) { - this.role = role; - } - - public int getSecurity() { - return security; - } - - public void setSecurity(int security) { - this.security = security; - } - - public List getAreacode() { - return areacode; - } - - public void setAreacode(List areacode) { - this.areacode = areacode; - } - - public long getExpriation() { - return expriation; - } - - public void setExpriation(int expriation) { - this.expriation = expriation; - } - - - public LoginResult(String token, String department, String username,Integer userid, String roles, - Integer security, String areasCode, long expriation) - { - this.token=token; - this.department=str2intList(department); - this.username=username; - this.userid = userid; - this.role= str2intList(roles); - this.security=security; - this.areacode= str2intList(areasCode); - this.expriation=expriation; - } - private List str2intList(String str) - { - if(str==null) - { - return new ArrayList<>(); - } - String s=trimBothEndsChars(str,","); - return Stream.of(s.split(",")).map(Integer::parseInt).collect(Collectors.toList()); - } - /** - * 去除字符串首尾两端指定的字符 - * */ - private static String trimBothEndsChars(String srcStr, String splitter) { - String regex = "^" + splitter + "*|" + splitter + "*$"; - return srcStr.replaceAll(regex, ""); - } -} diff --git a/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java b/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java deleted file mode 100644 index 2c0692d..0000000 --- a/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cetc32.dh.beans; - - -import com.alibaba.fastjson.annotation.JSONField; - -import java.util.Date; - -public class ResultDataCollected { - private Integer userid; - private String eventtype; - private String points; - private String cityname; - private Date uploadtime; - private String describe; - private String photopath; - - - - public String getPhotopath() { - return photopath; - } - - public void setPhotopath(String photopath) { - this.photopath = photopath; - } - - - public Integer getUserid() { - return userid; - } - - public void setUserid(Integer userid) { - this.userid = userid; - } - - public String getEventtype() { - return eventtype; - } - - public void setEventtype(String eventtype) { - this.eventtype = eventtype; - } - - public String getPoints() { - return points; - } - - public void setPoints(String points) { - this.points = points; - } - - public String getCityname() { - return cityname; - } - - public void setCityname(String cityname) { - this.cityname = cityname; - } - - public Date getUploadtime() { - return uploadtime; - } - - public void setUploadtime(Date uploadtime) { - this.uploadtime = uploadtime; - } - - public String getDescribe() { - return describe; - } - - public void setDescribe(String describe) { - this.describe = describe; - } - -} diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java deleted file mode 100644 index 8d8c3eb..0000000 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.cetc32.dh.beans; - -import com.cetc32.dh.entity.NumberS; - -import javax.persistence.Column; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static com.cetc32.dh.common.utils.Tools.str2intList; -import static com.cetc32.dh.common.utils.Tools.trimBothEndsChars; - -public class ResultUserInfo extends NumberS { - - private int id; - private String username; - private List role; - /** - * 用户安全等级 - * */ - private Integer security; - private List department; - private List areacode; - /** - * 用户状态 - * */ - private Integer userStatus; - /** - * 登记时间 - */ - private String regTime; - - - /** - * 失败次数 - * **/ - private Integer loginFailed; - - /** - * 网页登陆时间 - * **/ - private Date webLoginDate; - - /** - * 网页登陆状态 - * **/ - private Integer webLoginStatus; - - /** - * 网页登陆次数 - * **/ - private Integer webLoginCount; - - /** - * app登陆时间 - * **/ - private Date appLoginDate; - - /** - * app登陆状态 - * **/ - private Integer appLoginStatus; - - /** - * app登陆次数 - * **/ - private Integer appLoginCount; - - - public Integer getUserStatus() { - return userStatus; - } - - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public List getRole() { - return role; - } - public void setRole(String role) - { - this.role=str2intList(role); - } - - public List getDepartment() { - return department; - } - public void setDepartment(String department) - { - this.department=str2intList(department); - } - - public List getAreacode() { - return areacode; - } - - public void setAreacode(String areacode) - { - if(areacode ==null) - { - this.areacode = new ArrayList<>(); - return; - } - if(areacode instanceof String) - { - if(areacode.isEmpty()) - { - this.areacode = new ArrayList<>(); - return; - } - String s=trimBothEndsChars(areacode,","); - this.areacode=Stream.of(s.split(",")).collect(Collectors.toList()); - } - - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public Integer getSecurity() { - return security; - } - - public void setSecurity(Integer security) { - this.security = security; - } - - public String getRegTime() { - return regTime; - } - - public void setRegTime(String regTime) { - this.regTime = regTime; - } - - public Integer getLoginFailed() { - return loginFailed; - } - - public void setLoginFailed(Integer loginFailed) { - this.loginFailed = loginFailed; - } - - public Date getWebLoginDate() { - return webLoginDate; - } - - public void setWebLoginDate(Date webLoginDate) { - this.webLoginDate = webLoginDate; - } - - public Integer getWebLoginStatus() { - return webLoginStatus; - } - - public void setWebLoginStatus(Integer webLoginStatus) { - this.webLoginStatus = webLoginStatus; - } - - public Integer getWebLoginCount() { - return webLoginCount; - } - - public void setWebLoginCount(Integer webLoginCount) { - this.webLoginCount = webLoginCount; - } - - public Date getAppLoginDate() { - return appLoginDate; - } - - public void setAppLoginDate(Date appLoginDate) { - this.appLoginDate = appLoginDate; - } - - public Integer getAppLoginStatus() { - return appLoginStatus; - } - - public void setAppLoginStatus(Integer appLoginStatus) { - this.appLoginStatus = appLoginStatus; - } - - public Integer getAppLoginCount() { - return appLoginCount; - } - - public void setAppLoginCount(Integer appLoginCount) { - this.appLoginCount = appLoginCount; - } -} diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java deleted file mode 100644 index 446083a..0000000 --- a/src/main/java/com/cetc32/dh/beans/ResultUserInfoDe.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cetc32.dh.beans; - -import java.util.List; - -public class ResultUserInfoDe extends ResultUserInfo { - - private List roleName; - private List areaCodeName; - private List departmentName; - - public List getAreaCodeName() { - return areaCodeName; - } - - public void setAreaCodeName(List areaCodeName) { - this.areaCodeName = areaCodeName; - } - - public List getDepartmentName() { - return departmentName; - } - - public void setDepartmentName(List departmentName) { - this.departmentName = departmentName; - } - - - public List getRoleName() { - return roleName; - } - - public void setRoleName(List roleName) { - this.roleName = roleName; - } - -} diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserRole.java b/src/main/java/com/cetc32/dh/beans/ResultUserRole.java deleted file mode 100644 index df167a7..0000000 --- a/src/main/java/com/cetc32/dh/beans/ResultUserRole.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.cetc32.dh.beans; - -import com.cetc32.dh.common.utils.Tools; -import com.cetc32.dh.entity.BaseAdminRole; -import com.cetc32.dh.entity.NumberS; -import com.google.inject.internal.util.$ObjectArrays; -import org.apache.commons.lang3.StringUtils; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class ResultUserRole extends NumberS { - - private Integer id; - - - public List getSystemMenu() { - return systemMenu; - } - - public void setSystemMenu(Object systemMenu) { - if(systemMenu == null) - { - this.systemMenu = new ArrayList<>(); - } - else if(systemMenu instanceof String) - { - String s= Tools.trimBothEndsChars((String) systemMenu,","); - this.systemMenu= Stream.of(s.split(",")).collect(Collectors.toList()); - } - else - { - this.systemMenu = (List) systemMenu; - } - - } - private List systemMenu; - private String description; - private Integer isDefault; - - /** - * 角色名称 - */ - @Column(name = "role_name") - private String roleName; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getRoleName() { - return roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getIsDefault() { - return isDefault; - } - - public void setIsDefault(Integer isDefault) { - this.isDefault = isDefault; - } - - - -} diff --git a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java deleted file mode 100644 index 162c938..0000000 --- a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Copyright(C): CETC-32 - * 文件描述：过滤认证格式类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.filter; - - -import com.cetc32.dh.entity.BaseAdminUser; -import org.apache.shiro.session.Session; -import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.filter.authc.FormAuthenticationFilter; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -/** - * @Title: FormFilter - * @Description: 过滤认证格式类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述：2020/9/13加上 subject.isRemembered()，让它同时也兼容remember这种情况。 - */ -public class FormFilter extends FormAuthenticationFilter { - - /** - * 指定缓存失效时间 - * @param request servlet请求 - * @param response servlet响应 - * @param mappedValue 之前传输数据使用的对象，现在废弃了 - * @return 返回布尔值true，说明登陆用户为已登陆的且使用记住我功能登陆的用户，反之亦然。 - * 修改信息： - */ - @Override - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { - Subject subject = getSubject(request, response); - - // 如果 isAuthenticated 为 false 证明不是登录过的，同时 isRememberd 为true - // 证明是没登陆直接通过记住我功能进来的 - if (!subject.isAuthenticated() && subject.isRemembered()) { - - // 获取session看看是不是空的 - Session session = subject.getSession(true); - - // 查看session属性当前是否是空的 - if (session.getAttribute("userName") == null) { - // 如果是空的才初始化 - BaseAdminUser user = (BaseAdminUser)subject.getPrincipal(); - //存入用户数据 - session.setAttribute("userName", user.getSysUserName()); - } - } - - // 这个方法本来只返回 subject.isAuthenticated() 现在我们加上 subject.isRemembered() - // 让它同时也兼容remember这种情况 - return subject.isAuthenticated() || subject.isRemembered(); -// return true; - } - -} diff --git a/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java b/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java deleted file mode 100644 index da983d8..0000000 --- a/src/main/java/com/cetc32/dh/common/filter/JWTFilter.java +++ /dev/null @@ -1,201 +0,0 @@ -/** - * 文件描述： Token检查类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.filter; - -import com.auth0.jwt.exceptions.TokenExpiredException; -import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.config.JWTToken; -import com.cetc32.dh.config.RedisUtil; -import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URLEncoder; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -public class JWTFilter extends BasicHttpAuthenticationFilter { - /** - * 指定缓存失效时间 - * @param request servlet请求 - * @param response servlet响应 - * @param mappedValue 之前传输数据使用的对象，现在废弃了 - * @return 返回布尔值true或false，true说明toker校验通过 - * 修改信息： - */ - //是否允许访问，如果带有 token，则对 token 进行检查，否则直接通过 - @Override - protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) { - //判断请求的请求头是否带上 "Token" - System.out.println("isAccessAllowed"); - if (isLoginAttempt(request, response)){ - //如果存在，则进入 executeLogin 方法执行登入，检查 token 是否正确 - try { - executeLogin(request, response); - return true; - - }catch (Exception e){ - /* - * 注意这里捕获的异常其实是在Realm抛出的，但是由于executeLogin（）方法抛出的异常是从login（）来的， - * login抛出的异常类型是AuthenticationException，所以要去获取它的子类异常才能获取到我们在Realm抛出的异常类型。 - */ - System.out.println("刷新token"); - String msg=e.getMessage(); - Throwable cause = e.getCause(); - if (cause!=null&&cause instanceof TokenExpiredException){ - //AccessToken过期，尝试去刷新token - String result=refreshToken(request, response); - if (result.equals("success")){ - System.out.println("request.equals(\"success\")"); - return true; - } - msg=result; - } - responseError(response,msg); - } - } - //如果请求头不存在 Token，则可能是执行登陆操作或者是游客状态访问，无需检查 token，直接返回 true - return true; - } - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) { - HttpServletRequest req= (HttpServletRequest) request; - String token=req.getHeader("Authorization"); - return token !=null; - } - /** - * executeLogin实际上就是先调用createToken来获取token，这里我们重写了这个方法，就不会自动去调用createToken来获取token - * 然后调用getSubject方法来获取当前用户再调用login方法来实现登录 - * 这也解释了我们为什么要自定义jwtToken，因为我们不再使用Shiro默认的UsernamePasswordToken了。 - * */ - @Override - protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception { - System.out.println("executeLogin"); - HttpServletRequest req= (HttpServletRequest) request; - String token=req.getHeader("Authorization"); - JWTToken jwt=new JWTToken(token); - //交给自定义的realm对象去登录，如果错误他会抛出异常并被捕获 - getSubject(request, response).login(jwt); - return true; - } - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { - System.out.println("preHandle"); - HttpServletRequest req= (HttpServletRequest) request; - HttpServletResponse res= (HttpServletResponse) response; - res.setHeader("Access-control-Allow-Origin",req.getHeader("Origin")); - res.setHeader("Access-control-Allow-Methods","GET,POST,OPTIONS,PUT,DELETE"); - res.setHeader("Access-control-Allow-Headers",req.getHeader("Access-Control-Request-Headers")); - // 跨域时会首先发送一个option请求，这里我们给option请求直接返回正常状态 - if (req.getMethod().equals(RequestMethod.OPTIONS.name())) { - res.setStatus(HttpStatus.OK.value()); - return false; - } - return super.preHandle(request, response); - } - - /** - * 将非法请求跳转到 /unauthorized/** - */ - private void responseError(ServletResponse response, String message) { - System.out.println("responseError"); - - try { - HttpServletResponse httpServletResponse = (HttpServletResponse) response; - //设置编码，否则中文字符在重定向时会变为空字符串 - message = URLEncoder.encode(message, "UTF-8"); - httpServletResponse.sendRedirect("/unauthorized/" + message); - } catch (IOException e) { - System.out.println(e.getMessage()); - } - } - - - /** - * 这里的getBean是因为使用@Autowired无法把RedisUtil注入进来 - * 这样自动去注入当使用的时候是未NULL，是注入不进去了。通俗的来讲是因为拦截器在spring扫描bean之前加载所以注入不进去。 - * 解决的方法： - * 可以通过已经初始化之后applicationContext容器中去获取需要的bean. - * */ - public T getBean(Class clazz,HttpServletRequest request){ - WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); - return applicationContext.getBean(clazz); - } - - //刷新token - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - private String refreshToken(ServletRequest request,ServletResponse response) { - System.out.println("refreshToken"); - - HttpServletRequest req= (HttpServletRequest) request; - RedisUtil redisUtil=getBean(RedisUtil.class,req); - //获取传递过来的accessToken - String accessToken=req.getHeader("Authorization"); - //获取token里面的用户名 - String username= JWTUtil.getUsername(accessToken); - System.out.println("username"+username); - //判断refreshToken是否过期了，过期了那么所含的username的键不存在 - System.out.println("redisUtil.hasKey(username)"+redisUtil.hasKey(username)); - if (redisUtil.hasKey(username)){ - //判断refresh的时间节点和传递过来的accessToken的时间节点是否一致，不一致校验失败 - long current= (long) redisUtil.get(username); - if (current== JWTUtil.getExpire(accessToken)){ - //获取当前时间节点 - long currentTimeMillis = System.currentTimeMillis(); - //生成刷新的token - String token=JWTUtil.createToken(username,currentTimeMillis); - //刷新redis里面的refreshToken,过期时间是30min - redisUtil.set(username,currentTimeMillis,30*60); - //再次交给shiro进行认证 - JWTToken jwtToken=new JWTToken(token); - try { - getSubject(request, response).login(jwtToken); - // 最后将刷新的AccessToken存放在Response的Header中的Authorization字段返回 - HttpServletResponse httpServletResponse = (HttpServletResponse) response; - httpServletResponse.setHeader("Authorization", token); - httpServletResponse.setHeader("Access-Control-Expose-Headers", "Authorization"); - return "success"; - }catch (Exception e){ - return e.getMessage(); - } - } - } - return "token认证失效，token过期，重新登陆"; - } -} diff --git a/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java b/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java deleted file mode 100644 index 5b9122c..0000000 --- a/src/main/java/com/cetc32/dh/common/filter/KickoutSessionFilter.java +++ /dev/null @@ -1,239 +0,0 @@ -/** - * @Title: KickouSessionFilter - * @Description: 进行用户访问控制 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.filter; - -import com.cetc32.dh.common.IStatusMessage; -import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.ShiroFilterUtils; -import com.cetc32.dh.entity.BaseAdminUser; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.shiro.cache.Cache; -import org.apache.shiro.cache.CacheManager; -import org.apache.shiro.session.Session; -import org.apache.shiro.session.mgt.DefaultSessionKey; -import org.apache.shiro.session.mgt.SessionManager; -import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.filter.AccessControlFilter; -import org.apache.shiro.web.util.WebUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Serializable; -import java.util.ArrayDeque; -import java.util.Deque; - -/** - * Token检查类 - * @Title: FormFilter - * @version: 1.0 - * @date: 2020/9/11 10:55 - */ -public class KickoutSessionFilter extends AccessControlFilter { - - private static final Logger logger = LoggerFactory.getLogger(KickoutSessionFilter.class); - - private final static ObjectMapper objectMapper = new ObjectMapper(); - - private String kickoutUrl; // 踢出后到的地址 - private boolean kickoutAfter = false; // 踢出之前登录的/之后登录的用户 默认false踢出之前登录的用户 - private int maxSession = 1; // 同一个帐号最大会话数 默认1 - private SessionManager sessionManager; - private Cache> cache; - - public void setKickoutUrl(String kickoutUrl) { - this.kickoutUrl = kickoutUrl; - } - - public void setKickoutAfter(boolean kickoutAfter) { - this.kickoutAfter = kickoutAfter; - } - - public void setMaxSession(int maxSession) { - this.maxSession = maxSession; - } - - public void setSessionManager(SessionManager sessionManager) { - this.sessionManager = sessionManager; - } - - // 设置Cache的key的前缀 - public void setCacheManager(CacheManager cacheManager) { - //必须和ehcache缓存配置中的缓存name一致 - this.cache = cacheManager.getCache("shiro-activeSessionCache"); - } - - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) throws Exception { -// return false; - return true; - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - @Override - protected boolean onAccessDenied(ServletRequest request, ServletResponse response)throws Exception { - Subject subject = getSubject(request,response); - // 没有登录授权 且没有记住我 - if(!subject.isAuthenticated() && !subject.isRemembered()){ - // 如果没有登录，直接进行之后的流程 - return true; - } - // 获得用户请求的URI - HttpServletRequest req=(HttpServletRequest) request; - String path = req.getRequestURI(); - logger.info("===当前请求的uri:" + path); - - if(path.equals("/login")){ - return true; - } - Session session = subject.getSession(); - logger.info("session时间设置：" + String.valueOf(session.getTimeout())); - - - try{ - // 当前用户 - BaseAdminUser user = (BaseAdminUser) subject.getPrincipal(); - String username = user.getSysUserName(); - logger.info("===当前用户username:" + username); - Serializable sessionId = session.getId(); - logger.info("===当前用户sessionId:" + sessionId); - // 读取缓存用户 没有就存入 - Deque deque = cache.get(username); - logger.debug("===当前deque:" + deque); - if (deque == null) { - // 初始化队列 - deque = new ArrayDeque(); - } - // 如果队列里没有此sessionId，且用户没有被踢出；放入队列 - if (!deque.contains(sessionId) && session.getAttribute("kickout") == null) { - // 将sessionId存入队列 - deque.push(sessionId); - // 将用户的sessionId队列缓存 - cache.put(username, deque); - } - // 如果队列里的sessionId数超出最大会话数，开始踢人 - while (deque.size() > maxSession) { - logger.debug("===deque队列长度:" + deque.size()); - Serializable kickoutSessionId = null; - // 是否踢出后来登录的，默认是false；即后者登录的用户踢出前者登录的用户； - if (kickoutAfter) { // 如果踢出后者 - kickoutSessionId = deque.removeFirst(); - } else { // 否则踢出前者 - kickoutSessionId = deque.removeLast(); - } - // 踢出后再更新下缓存队列 - cache.put(username, deque); - try{ - // 获取被踢出的sessionId的session对象 - Session kickoutSession = sessionManager - .getSession(new DefaultSessionKey(kickoutSessionId)); - if (kickoutSession != null) { - // 设置会话的kickout属性表示踢出了 - kickoutSession.setAttribute("kickout", true); - } - }catch (Exception e){ - - } - } - - // 如果被踢出了，(前者或后者)直接退出，重定向到踢出后的地址 - if ((Boolean) session.getAttribute("kickout") != null - && (Boolean) session.getAttribute("kickout") == true){ - // 会话被踢出了 - try { - // 退出登录 - subject.logout(); - } catch (Exception e) { // ignore - } - saveRequest(request); - logger.debug("===踢出后用户重定向的路径kickoutUrl:" + kickoutUrl); - return isAjaxResponse(request,response); - } - return true; - }catch (Exception e){ - logger.error("控制用户在线数量【KickoutSessionFilter.onAccessDenied】异常！", e); - return isAjaxResponse(request,response); - } - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static void out(ServletResponse response, ResponseResult result){ - PrintWriter out = null; - try { - response.setCharacterEncoding("UTF-8");//设置编码 - response.setContentType("application/json");//设置返回类型 - out = response.getWriter(); - out.println(objectMapper.writeValueAsString(result));//输出 - logger.info("用户在线数量限制【KickoutSessionFilter.out】响应json信息成功"); - } catch (Exception e) { - logger.error("用户在线数量限制【KickoutSessionFilter.out】响应json信息出错", e); - }finally{ - if(null != out){ - out.flush(); - out.close(); - } - } - } - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - private boolean isAjaxResponse(ServletRequest request, - ServletResponse response) throws IOException { - // ajax请求 - /** - * 判断是否已经踢出 - * 1.如果是Ajax 访问，那么给予json返回值提示。 - * 2.如果是普通请求，直接跳转到登录页 - */ - //判断是不是Ajax请求 - ResponseResult responseResult = new ResponseResult(); - if (ShiroFilterUtils.isAjax(request) ) { - logger.info(getClass().getName()+ "当前用户已经在其他地方登录，并且是Ajax请求！"); - responseResult.setCode(IStatusMessage.SystemStatus.MANY_LOGINS.getCode()); - responseResult.setMessage("您已在别处登录，请您修改密码或重新登录"); - out(response, responseResult); - }else{ - // 重定向 - WebUtils.issueRedirect(request, response, kickoutUrl); - } - return false; -// return true; - } - - -} diff --git a/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java b/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java deleted file mode 100644 index 9ab2577..0000000 --- a/src/main/java/com/cetc32/dh/common/utils/JWTUtil.java +++ /dev/null @@ -1,115 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: 自定义Realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.utils; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.JWTVerifier; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.JWTDecodeException; -import com.auth0.jwt.interfaces.DecodedJWT; - -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -/** - * 响应状态信息接口 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -public class JWTUtil { - //token有效时长 - private static final long EXPIRE=2*60*60*1000; - //token的密钥 - private static final String SECRET="jwt+shiro+32s"; - - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static String createToken(String username,long current){ - Date date= new Date(current+EXPIRE); - //JWT的header部分 - Map map =new HashMap<>(); - map.put("alg","HS256"); - map.put("typ","JWT"); - - //使用JWT生成 token - String token=null; - try{ - token= JWT.create() - .withHeader(map) - .withClaim("username",username) - .withClaim("current",current) - .withIssuedAt(new Date()) - .withExpiresAt(date) - .sign(Algorithm.HMAC256(SECRET)); - }catch (UnsupportedEncodingException e){ - e.printStackTrace(); - } - return token; - } - - ////校验token的有效性，1、token的header和payload是否没改过；2、没有过期 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static boolean verify(String token){ - try{ - JWTVerifier verifier=JWT.require(Algorithm.HMAC256(SECRET)).build(); - verifier.verify(token); - return true; - }catch ( Exception e){ - - } - return false; - } - //无需解密也可以获取token的信息 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static String getUsername(String token){ - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("username").asString(); - } catch (JWTDecodeException e) { - return null; - } - } - - //获取过期时间 - /** - * 指定缓存失效时间 - * @param key 键 - * @param time 时间(秒) - * @return - * 修改信息： - */ - public static long getExpire(String token){ - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("exp").asLong(); - }catch (Exception e){ - return System.currentTimeMillis()/1000; - } - } -} diff --git a/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java b/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java deleted file mode 100644 index 25344e3..0000000 --- a/src/main/java/com/cetc32/dh/common/utils/ShiroFilterUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @Title: CenterAuthShiroConfig - * @Description: 自定义Realm - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.common.utils; - -import com.cetc32.dh.common.response.ResponseResult; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.PrintWriter; - -/** - * @Title: ShiroFilterUtils - * @Description: shiro工具类 - * @author: youqing - * @version: 1.0 - * @date: 2018/11/23 9:54 - */ -public class ShiroFilterUtils { - - private static final Logger logger = LoggerFactory.getLogger(ShiroFilterUtils.class); - - private final static ObjectMapper objectMapper = new ObjectMapper(); - - /** - * - * 功能描述: 判断请求是否是ajax - * - * @param: - * @return: - * @auther: youqing - * @date: 2018/11/23 9:57 - */ - public static boolean isAjax(ServletRequest request){ - String header = ((HttpServletRequest) request).getHeader("X-Requested-With"); - if("XMLHttpRequest".equalsIgnoreCase(header)){ - logger.info("shiro工具类【ShiroFilterUtils.isAjax】当前请求,为Ajax请求"); - return Boolean.TRUE; - } - logger.debug("shiro工具类【ShiroFilterUtils.isAjax】当前请求,非Ajax请求"); - return Boolean.FALSE; - } - - /** - * - * 功能描述: response输出json - * - * @param: - * @return: - * @auther: youqing - * @date: 2018/11/23 9:58 - */ - public static void out(HttpServletResponse response, ResponseResult result){ - PrintWriter out = null; - try { - response.setCharacterEncoding("UTF-8");//设置编码 - response.setContentType("application/json");//设置返回类型 - out = response.getWriter(); - out.println(objectMapper.writeValueAsString(result));//输出 - logger.info("用户在线数量限制【ShiroFilterUtils.out】响应json信息成功"); - } catch (Exception e) { - logger.error("用户在线数量限制【ShiroFilterUtils.out】响应json信息出错", e); - }finally{ - if(null != out){ - out.flush(); - out.close(); - } - } - } -} diff --git a/src/main/java/com/cetc32/dh/config/JWTToken.java b/src/main/java/com/cetc32/dh/config/JWTToken.java deleted file mode 100644 index 0a52f62..0000000 --- a/src/main/java/com/cetc32/dh/config/JWTToken.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @Description: 数据管理配置 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.config; - -import org.apache.shiro.authc.AuthenticationToken; - -/** - * 数据管理配置 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * @Description: MVC配置信息 - * 更改描述： - */ -public class JWTToken implements AuthenticationToken { - private String token; - public JWTToken(String token){ - this.token =token; - } - @Override - public Object getPrincipal() { - return token; - } - - @Override - public Object getCredentials() { - return token; - } -} diff --git a/src/main/java/com/cetc32/dh/config/RedisConfig.java b/src/main/java/com/cetc32/dh/config/RedisConfig.java index 3d9e851..2f67f4e 100644 --- a/src/main/java/com/cetc32/dh/config/RedisConfig.java +++ b/src/main/java/com/cetc32/dh/config/RedisConfig.java @@ -25,7 +25,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; * @Description: MVC配置信息 * 更改描述： */ -@Configuration +//@Configuration public class RedisConfig { @Bean @SuppressWarnings("all") @@ -49,4 +49,4 @@ public class RedisConfig { template.afterPropertiesSet(); return template; } -} \ No newline at end of file +} diff --git a/src/main/java/com/cetc32/dh/config/RedisUtil.java b/src/main/java/com/cetc32/dh/config/RedisUtil.java index d4f570f..2947cc1 100644 --- a/src/main/java/com/cetc32/dh/config/RedisUtil.java +++ b/src/main/java/com/cetc32/dh/config/RedisUtil.java @@ -24,9 +24,9 @@ import org.springframework.util.CollectionUtils; * @Description: MVC配置信息 * 更改描述： */ -@Component +//@Component public final class RedisUtil { - @Autowired + //@Autowired private RedisTemplate redisTemplate; /** @@ -506,4 +506,4 @@ public final class RedisUtil { return 0; } } -} \ No newline at end of file +} 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 b8e1f77..7dc3df0 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DemanSubmitController.java @@ -5,7 +5,6 @@ import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.common.utils.DateUtils; import com.cetc32.dh.dto.DemandDTO; import com.cetc32.dh.dto.DemandSubmitDTO; -import com.cetc32.dh.entity.BaseAdminUser; import com.cetc32.dh.entity.DemandSubmit; import com.cetc32.dh.entity.vDemand; import com.cetc32.dh.service.DemandSubmitService; 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 187525d..6936ed0 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/EstimateTaskController.java @@ -5,8 +5,6 @@ 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.dto.EstimateDTO; -import com.cetc32.dh.entity.BaseAdminUser; -import com.cetc32.dh.entity.DemandSubmit; import com.cetc32.dh.entity.EstimateTask; import com.cetc32.dh.entity.vEstimate; import com.cetc32.dh.service.EstimateTaskService; 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 1a87c72..4ee6500 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -1,5 +1,6 @@ package com.cetc32.dh.controller.rest; +import com.alibaba.fastjson.JSONObject; import com.cetc32.dh.beans.DhOflineData; import com.cetc32.dh.beans.ReqSubmit; import com.cetc32.dh.beans.TraceUpload; @@ -146,13 +147,13 @@ public class OtherInterfaceController { } @ApiOperation(value = "评估任务状态反馈") @PostMapping("/callback/evaluation") - public ResponseData callbackEvaluation(@RequestBody Map req) + public ResponseData callbackEvaluation(@RequestBody JSONObject req) { try { - Integer taskid=req.get("taskid")==null?null:Integer.parseInt(req.get("taskid")) ; - String status=req.get("status"); - String report =req.get("report"); + Integer taskid=req.getInteger("taskid") ; + String status=req.getString("status"); + JSONObject report =req.getJSONObject("report"); if(taskid!=null && status!=null) { EstimateTask submit=estimateTaskService.selectByPrimaryKey(taskid); @@ -168,7 +169,8 @@ public class OtherInterfaceController { }*/ submit.setStatus(status); - submit.setReport(report); + if(null != report) + submit.setReport(report.toJSONString()); if(estimateTaskService.updateByPrimaryKeySelective(submit)>0) { return ResponseData.success("状态反馈成功"); diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index e8f4dcc..7fd0759 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -1,16 +1,10 @@ package com.cetc32.dh.controller.rest; - -import com.cetc32.dh.beans.LoginParameter; -import com.cetc32.dh.beans.LoginResult; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; -import com.cetc32.dh.common.utils.DigestUtils; -import com.cetc32.dh.common.utils.JWTUtil; -import com.cetc32.dh.entity.*;import com.cetc32.dh.service.CityService; +import com.cetc32.dh.entity.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.cetc32.dh.service.ProvinceGeomService; diff --git a/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java b/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java index ec4b6c0..2218af4 100644 --- a/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java +++ b/src/main/java/com/cetc32/dh/dto/AreaCommonDTO.java @@ -1,6 +1,5 @@ package com.cetc32.dh.dto; -import com.cetc32.dh.entity.AreaCommon; import java.util.List; diff --git a/src/main/java/com/cetc32/dh/entity/AreaCommon.java b/src/main/java/com/cetc32/dh/entity/AreaCommon.java deleted file mode 100644 index 0d9f222..0000000 --- a/src/main/java/com/cetc32/dh/entity/AreaCommon.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.cetc32.dh.entity; - -import javax.persistence.*; - - -@Table(name = "area_common") -public class AreaCommon { - public AreaCommon(){} - - public AreaCommon(String id,String parentId,String name,String mergerName,String shortName,String levelType, - String cityCode,String lng,String lat,String remarks, String geom){ - this.id=id; - this.parentId=parentId; - this.name=name; - this.mergerName=mergerName; - this.shortName=shortName; - this.levelType=levelType; - this.cityCode=cityCode; - this.lat=lat; - this.lng=lng; - this.remarks=remarks; - this.geom=geom; - } - - @Id -// @GeneratedValue(strategy = GenerationType.IDENTITY) - private String id; - - @Column(name = "parent_id") - private String parentId; - - private String name; - - @Column(name = "merger_name") - private String mergerName; - - @Column(name = "short_name") - private String shortName; - - @Column(name = "level_type") - private String levelType; - - @Column(name = "city_code") - private String cityCode; - - private String lng; - - private String lat; - - private String remarks; - - private String geom; - - /** - * @return id - */ - public String getId() { - return id; - } - - /** - * @param id - */ - public void setId(String id) { - this.id = id == null ? null : id.trim(); - } - - /** - * @return parent_id - */ - public String getParentId() { - return parentId; - } - - /** - * @param parentId - */ - public void setParentId(String parentId) { - this.parentId = parentId == null ? null : parentId.trim(); - } - - /** - * @return name - */ - public String getName() { - return name; - } - - /** - * @param name - */ - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - /** - * @return merger_name - */ - public String getMergerName() { - return mergerName; - } - - /** - * @param mergerName - */ - public void setMergerName(String mergerName) { - this.mergerName = mergerName == null ? null : mergerName.trim(); - } - - /** - * @return short_name - */ - public String getShortName() { - return shortName; - } - - /** - * @param shortName - */ - public void setShortName(String shortName) { - this.shortName = shortName == null ? null : shortName.trim(); - } - - /** - * @return level_type - */ - public String getLevelType() { - return levelType; - } - - /** - * @param levelType - */ - public void setLevelType(String levelType) { - this.levelType = levelType == null ? null : levelType.trim(); - } - - /** - * @return city_code - */ - public String getCityCode() { - return cityCode; - } - - /** - * @param cityCode - */ - public void setCityCode(String cityCode) { - this.cityCode = cityCode == null ? null : cityCode.trim(); - } - - /** - * @return lng - */ - public String getLng() { - return lng; - } - - /** - * @param lng - */ - public void setLng(String lng) { - this.lng = lng == null ? null : lng.trim(); - } - - /** - * @return lat - */ - public String getLat() { - return lat; - } - - /** - * @param lat - */ - public void setLat(String lat) { - this.lat = lat == null ? null : lat.trim(); - } - - /** - * @return remarks - */ - public String getRemarks() { - return remarks; - } - - /** - * @param remarks - */ - public void setRemarks(String remarks) { - this.remarks = remarks == null ? null : remarks.trim(); - } - - public String getGeom() { - return geom; - } - - public void setGeom(String geom) { - this.geom = geom; - } - - public String toString() { - return "{" + - "id =" + id +'\'' + - "parentId=" + parentId +'\''+ - ", name='" + name + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/AreaCommonExample.java b/src/main/java/com/cetc32/dh/entity/AreaCommonExample.java deleted file mode 100644 index d89d48f..0000000 --- a/src/main/java/com/cetc32/dh/entity/AreaCommonExample.java +++ /dev/null @@ -1,900 +0,0 @@ -package com.cetc32.dh.entity; - -import java.util.ArrayList; -import java.util.List; - -public class AreaCommonExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public AreaCommonExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(String value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(String value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(String value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(String value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(String value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(String value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLike(String value) { - addCriterion("id like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotLike(String value) { - addCriterion("id not like", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(String value1, String value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(String value1, String value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andParentIdIsNull() { - addCriterion("parent_id is null"); - return (Criteria) this; - } - - public Criteria andParentIdIsNotNull() { - addCriterion("parent_id is not null"); - return (Criteria) this; - } - - public Criteria andParentIdEqualTo(String value) { - addCriterion("parent_id =", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotEqualTo(String value) { - addCriterion("parent_id <>", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThan(String value) { - addCriterion("parent_id >", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThanOrEqualTo(String value) { - addCriterion("parent_id >=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThan(String value) { - addCriterion("parent_id <", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThanOrEqualTo(String value) { - addCriterion("parent_id <=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLike(String value) { - addCriterion("parent_id like", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotLike(String value) { - addCriterion("parent_id not like", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdIn(List values) { - addCriterion("parent_id in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotIn(List values) { - addCriterion("parent_id not in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdBetween(String value1, String value2) { - addCriterion("parent_id between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotBetween(String value1, String value2) { - addCriterion("parent_id not between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andMergerNameIsNull() { - addCriterion("merger_name is null"); - return (Criteria) this; - } - - public Criteria andMergerNameIsNotNull() { - addCriterion("merger_name is not null"); - return (Criteria) this; - } - - public Criteria andMergerNameEqualTo(String value) { - addCriterion("merger_name =", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameNotEqualTo(String value) { - addCriterion("merger_name <>", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameGreaterThan(String value) { - addCriterion("merger_name >", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameGreaterThanOrEqualTo(String value) { - addCriterion("merger_name >=", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameLessThan(String value) { - addCriterion("merger_name <", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameLessThanOrEqualTo(String value) { - addCriterion("merger_name <=", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameLike(String value) { - addCriterion("merger_name like", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameNotLike(String value) { - addCriterion("merger_name not like", value, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameIn(List values) { - addCriterion("merger_name in", values, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameNotIn(List values) { - addCriterion("merger_name not in", values, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameBetween(String value1, String value2) { - addCriterion("merger_name between", value1, value2, "mergerName"); - return (Criteria) this; - } - - public Criteria andMergerNameNotBetween(String value1, String value2) { - addCriterion("merger_name not between", value1, value2, "mergerName"); - return (Criteria) this; - } - - public Criteria andShortNameIsNull() { - addCriterion("short_name is null"); - return (Criteria) this; - } - - public Criteria andShortNameIsNotNull() { - addCriterion("short_name is not null"); - return (Criteria) this; - } - - public Criteria andShortNameEqualTo(String value) { - addCriterion("short_name =", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotEqualTo(String value) { - addCriterion("short_name <>", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThan(String value) { - addCriterion("short_name >", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameGreaterThanOrEqualTo(String value) { - addCriterion("short_name >=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThan(String value) { - addCriterion("short_name <", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLessThanOrEqualTo(String value) { - addCriterion("short_name <=", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameLike(String value) { - addCriterion("short_name like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotLike(String value) { - addCriterion("short_name not like", value, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameIn(List values) { - addCriterion("short_name in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotIn(List values) { - addCriterion("short_name not in", values, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameBetween(String value1, String value2) { - addCriterion("short_name between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andShortNameNotBetween(String value1, String value2) { - addCriterion("short_name not between", value1, value2, "shortName"); - return (Criteria) this; - } - - public Criteria andLevelTypeIsNull() { - addCriterion("level_type is null"); - return (Criteria) this; - } - - public Criteria andLevelTypeIsNotNull() { - addCriterion("level_type is not null"); - return (Criteria) this; - } - - public Criteria andLevelTypeEqualTo(String value) { - addCriterion("level_type =", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeNotEqualTo(String value) { - addCriterion("level_type <>", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeGreaterThan(String value) { - addCriterion("level_type >", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeGreaterThanOrEqualTo(String value) { - addCriterion("level_type >=", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeLessThan(String value) { - addCriterion("level_type <", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeLessThanOrEqualTo(String value) { - addCriterion("level_type <=", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeLike(String value) { - addCriterion("level_type like", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeNotLike(String value) { - addCriterion("level_type not like", value, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeIn(List values) { - addCriterion("level_type in", values, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeNotIn(List values) { - addCriterion("level_type not in", values, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeBetween(String value1, String value2) { - addCriterion("level_type between", value1, value2, "levelType"); - return (Criteria) this; - } - - public Criteria andLevelTypeNotBetween(String value1, String value2) { - addCriterion("level_type not between", value1, value2, "levelType"); - return (Criteria) this; - } - - public Criteria andCityCodeIsNull() { - addCriterion("city_code is null"); - return (Criteria) this; - } - - public Criteria andCityCodeIsNotNull() { - addCriterion("city_code is not null"); - return (Criteria) this; - } - - public Criteria andCityCodeEqualTo(String value) { - addCriterion("city_code =", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotEqualTo(String value) { - addCriterion("city_code <>", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeGreaterThan(String value) { - addCriterion("city_code >", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeGreaterThanOrEqualTo(String value) { - addCriterion("city_code >=", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLessThan(String value) { - addCriterion("city_code <", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLessThanOrEqualTo(String value) { - addCriterion("city_code <=", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeLike(String value) { - addCriterion("city_code like", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotLike(String value) { - addCriterion("city_code not like", value, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeIn(List values) { - addCriterion("city_code in", values, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotIn(List values) { - addCriterion("city_code not in", values, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeBetween(String value1, String value2) { - addCriterion("city_code between", value1, value2, "cityCode"); - return (Criteria) this; - } - - public Criteria andCityCodeNotBetween(String value1, String value2) { - addCriterion("city_code not between", value1, value2, "cityCode"); - return (Criteria) this; - } - - public Criteria andLngIsNull() { - addCriterion("lng is null"); - return (Criteria) this; - } - - public Criteria andLngIsNotNull() { - addCriterion("lng is not null"); - return (Criteria) this; - } - - public Criteria andLngEqualTo(String value) { - addCriterion("lng =", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotEqualTo(String value) { - addCriterion("lng <>", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThan(String value) { - addCriterion("lng >", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngGreaterThanOrEqualTo(String value) { - addCriterion("lng >=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThan(String value) { - addCriterion("lng <", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLessThanOrEqualTo(String value) { - addCriterion("lng <=", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngLike(String value) { - addCriterion("lng like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotLike(String value) { - addCriterion("lng not like", value, "lng"); - return (Criteria) this; - } - - public Criteria andLngIn(List values) { - addCriterion("lng in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotIn(List values) { - addCriterion("lng not in", values, "lng"); - return (Criteria) this; - } - - public Criteria andLngBetween(String value1, String value2) { - addCriterion("lng between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLngNotBetween(String value1, String value2) { - addCriterion("lng not between", value1, value2, "lng"); - return (Criteria) this; - } - - public Criteria andLatIsNull() { - addCriterion("lat is null"); - return (Criteria) this; - } - - public Criteria andLatIsNotNull() { - addCriterion("lat is not null"); - return (Criteria) this; - } - - public Criteria andLatEqualTo(String value) { - addCriterion("lat =", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotEqualTo(String value) { - addCriterion("lat <>", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThan(String value) { - addCriterion("lat >", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatGreaterThanOrEqualTo(String value) { - addCriterion("lat >=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThan(String value) { - addCriterion("lat <", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLessThanOrEqualTo(String value) { - addCriterion("lat <=", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatLike(String value) { - addCriterion("lat like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotLike(String value) { - addCriterion("lat not like", value, "lat"); - return (Criteria) this; - } - - public Criteria andLatIn(List values) { - addCriterion("lat in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotIn(List values) { - addCriterion("lat not in", values, "lat"); - return (Criteria) this; - } - - public Criteria andLatBetween(String value1, String value2) { - addCriterion("lat between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andLatNotBetween(String value1, String value2) { - addCriterion("lat not between", value1, value2, "lat"); - return (Criteria) this; - } - - public Criteria andRemarksIsNull() { - addCriterion("remarks is null"); - return (Criteria) this; - } - - public Criteria andRemarksIsNotNull() { - addCriterion("remarks is not null"); - return (Criteria) this; - } - - public Criteria andRemarksEqualTo(String value) { - addCriterion("remarks =", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksNotEqualTo(String value) { - addCriterion("remarks <>", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksGreaterThan(String value) { - addCriterion("remarks >", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksGreaterThanOrEqualTo(String value) { - addCriterion("remarks >=", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksLessThan(String value) { - addCriterion("remarks <", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksLessThanOrEqualTo(String value) { - addCriterion("remarks <=", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksLike(String value) { - addCriterion("remarks like", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksNotLike(String value) { - addCriterion("remarks not like", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksIn(List values) { - addCriterion("remarks in", values, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksNotIn(List values) { - addCriterion("remarks not in", values, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksBetween(String value1, String value2) { - addCriterion("remarks between", value1, value2, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksNotBetween(String value1, String value2) { - addCriterion("remarks not between", value1, value2, "remarks"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java b/src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java deleted file mode 100644 index 0e4b842..0000000 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminPermission.java +++ /dev/null @@ -1,208 +0,0 @@ -/** - * @Description: 用户权限实体类 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ - -package com.cetc32.dh.entity; - -import javax.persistence.*; - -/** - * @Title: BaseAdminPermission - * @Description: - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 11:19 - */ -@Table(name = "base_admin_permission") -public class BaseAdminPermission { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - - /** - * 菜单名称 - */ - private String name; - - /** - * 父菜单id - */ - private Integer pid; - - /** - * 描述 - */ - private String descpt; - - /** - * 菜单url - */ - private String url; - - /** - * 添加时间 - */ - @Column(name = "create_time") - private String createTime; - - /** - * 更新时间 - */ - @Column(name = "update_time") - private String updateTime; - - /** - * 删除标志（0:删除 1：存在） - */ - @Column(name = "del_flag") - private Integer delFlag; - - /** - * @return id - */ - public Integer getId() { - return id; - } - - /** - * @param id - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取菜单名称 - * @return name - 菜单名称 - */ - public String getName() { - return name; - } - - /** - * 设置菜单名称 - * @param name 菜单名称 - */ - public void setName(String name) { - this.name = name; - } - - /** - * 获取父菜单id - * @return pid - 父菜单id - */ - public Integer getPid() { - return pid; - } - - /** - * 设置父菜单id - * @param pid 父菜单id - */ - public void setPid(Integer pid) { - this.pid = pid; - } - - /** - * 获取描述 - * @return descpt - 描述 - */ - public String getDescpt() { - return descpt; - } - - /** - * 设置描述 - * @param descpt 描述 - */ - public void setDescpt(String descpt) { - this.descpt = descpt; - } - - /** - * 获取菜单url - * @return url - 菜单url - */ - public String getUrl() { - return url; - } - - /** - * 设置菜单url - * @param url 菜单url - */ - public void setUrl(String url) { - this.url = url; - } - - /** - * 获取添加时间 - * @return create_time - 添加时间 - */ - public String getCreateTime() { - return createTime; - } - - /** - * 设置添加时间 - * @param createTime 添加时间 - */ - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - /** - * 获取更新时间 - * - * @return update_time - 更新时间 - */ - public String getUpdateTime() { - return updateTime; - } - - /** - * 设置更新时间 - * @param updateTime 更新时间 - */ - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - /** - * 获取删除标志（0:删除 1：存在） - * @return del_flag - 删除标志（0:删除 1：存在） - */ - public Integer getDelFlag() { - return delFlag; - } - - /** - * 设置删除标志（0:删除 1：存在） - * @param delFlag 删除标志（0:删除 1：存在） - */ - public void setDelFlag(Integer delFlag) { - this.delFlag = delFlag; - } - - /** - * 返回实体字符串数据 - */ - @Override - public String toString() { - return "BaseAdminPermission{" + - "id=" + id + - ", name='" + name + '\'' + - ", pid=" + pid + - ", descpt='" + descpt + '\'' + - ", url='" + url + '\'' + - ", createTime='" + createTime + '\'' + - ", updateTime='" + updateTime + '\'' + - ", delFlag=" + delFlag + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java b/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java deleted file mode 100644 index 653c6d2..0000000 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminRole.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.cetc32.dh.entity; - -import com.cetc32.dh.common.utils.Tools; -import org.apache.commons.collections.iterators.ArrayListIterator; -import org.apache.commons.lang3.StringUtils; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - - -public class BaseAdminRole extends NumberS { - - /** - * 权限角色ID - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - - - public String getSystemMenu() { - return systemMenu; - } - - public void setSystemMenu(Object systemMenu) { - if(systemMenu==null) - { - this.systemMenu=null; - return; - } - if(systemMenu instanceof ArrayList) - { - - this.systemMenu=","+ StringUtils.join( (List)systemMenu,",")+","; - - } - else - { - this.systemMenu = (String) systemMenu; - } - } -// public void setSystemMenu(List systemMenu) { -// this.systemMenu = systemMenu!=null?","+ StringUtils.join(systemMenu,",")+",": null; -// } - - /** - * 系统菜单权限 - */ - @Column(name = "system_menu") - private String systemMenu; - - /** - * 角色描述 - */ - @Column(name = "description") - private String description; - - /** - * 是否为系统内置角色 - * 值为1，表只能改变角色名及描述，不过能修改权限，不能删除 - * 其他表示可删除和更改 - */ - @Column(name = "is_default") - private Integer isDefault; - - /** - * 角色名称 - */ - @Column(name = "role_name") - private String roleName; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getRoleName() { - return roleName; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } - - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getIsDefault() { - return isDefault; - } - - public void setIsDefault(Integer isDefault) { - this.isDefault = isDefault; - } -} diff --git a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java b/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java deleted file mode 100644 index c69dd9a..0000000 --- a/src/main/java/com/cetc32/dh/entity/BaseAdminUser.java +++ /dev/null @@ -1,508 +0,0 @@ -/** - * @Description: 用户管理实体 - * @author: youqing - * @version: 1.0 - * @date: 2020/9/11 10:55 - * 更改描述： - */ -package com.cetc32.dh.entity; - -import com.google.inject.internal.util.$ToStringBuilder; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; -import javax.persistence.*; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static com.cetc32.dh.common.utils.Tools.*; - -/** - * @Title: BaseAdminUser - * @Description: 用户管理 - * @author: youqing - * @version: 1.0 - * @date: 2020/11/21 13:43 - */ -@Repository -@Table(name = "base_admin_user") -public class BaseAdminUser extends NumberS { - /** - * ID - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - - /** - * 系统用户名称 - */ - @Column(name = "sys_user_name") - private String sysUserName; - - /** - * 系统用户密码 - */ - @Column(name = "sys_user_pwd") - private String sysUserPwd; - - /** - * 角色 - */ - @Column(name = "role_id") - private String roleId; - - /** - * 手机号 - */ - @Column(name = "user_phone") - private String userPhone; - - /** - * 登记时间 - */ - @Column(name = "reg_time") - private Date regTime; - - /** - * 状态（0：无效；1：有效） - */ - @Column(name = "user_status") - private Integer userStatus; - - /** - * 区域代码 - */ - @Column(name = "areacode") - private String areacode; - - /** - * 部门 - */ - @Column(name = "department") - private String department; - - /** - * 密级 - */ - @Column(name = "security") - private Integer security; - - /** - * 失败次数 - * **/ - @Column(name = "loginfailed") - private Integer loginFailed; - - /** - * 网页登陆时间 - * **/ - @Column(name = "web_login_time") - private Date webLoginDate; - - /** - * 网页登陆状态 - * **/ - @Column(name = "web_login_status") - private Integer webLoginStatus; - - /** - * 网页登陆次数 - * **/ - @Column(name = "web_login_count") - private Integer webLoginCount; - - /** - * app登陆时间 - * **/ - @Column(name = "app_login_time") - private Date appLoginDate; - - /** - * app登陆状态 - * **/ - @Column(name = "app_login_status") - private Integer appLoginStatus; - - /** - * app登陆次数 - * **/ - @Column(name = "app_login_count") - private Integer appLoginCount; - - public Integer getLoginFailed() { - return loginFailed; - } - - public void setLoginFailed(Integer loginFailed) { - this.loginFailed = loginFailed; - } - - public Date getWebLoginDate() { - return webLoginDate; - } - - public void setWebLoginDate(Date webLoginDate) { - this.webLoginDate = webLoginDate; - } - - public Integer getWebLoginStatus() { - return webLoginStatus; - } - - public void setWebLoginStatus(Integer webLoginStatus) { - this.webLoginStatus = webLoginStatus; - } - - public Integer getWebLoginCount() { - return webLoginCount; - } - - public void setWebLoginCount(Integer webLoginCount) { - this.webLoginCount = webLoginCount; - } - - public Date getAppLoginDate() { - return appLoginDate; - } - - public void setAppLoginDate(Date appLoginDate) { - this.appLoginDate = appLoginDate; - } - - public Integer getAppLoginStatus() { - return appLoginStatus; - } - - public void setAppLoginStatus(Integer appLoginStatus) { - this.appLoginStatus = appLoginStatus; - } - - public Integer getAppLoginCount() { - return appLoginCount; - } - - public void setAppLoginCount(Integer appLoginCount) { - this.appLoginCount = appLoginCount; - } - - /** - * 获取ID - * @return id - ID - */ - public Integer getId() { - return id; - } - - /** - * 设置ID - * @param id ID - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取系统用户名称 - * @return sys_user_name - 系统用户名称 - */ - public String getSysUserName() { - return sysUserName; - } - - /** - * 设置系统用户名称 - * @param sysUserName 系统用户名称 - */ - public void setSysUserName(String sysUserName) { - this.sysUserName = sysUserName; - } - - /** - * 获取系统用户密码 - * @return sys_user_pwd - 系统用户密码 - */ - public String getSysUserPwd() { - return sysUserPwd; - } - - /** - * 设置系统用户密码 - * @param sysUserPwd 系统用户密码 - */ - public void setSysUserPwd(String sysUserPwd) { - this.sysUserPwd = sysUserPwd; - } - - /** - * 获取角色 - * @return role_id - 角色 - */ - public String getRoleId() { - return roleId; - } - - /** - * 设置角色 - * @param roleId 角色 - */ -// public void setRoleId(String roleId) { -// this.roleId = roleId!=null?","+roleId+",":null; -// } -// public void setRoleId(List roleId) { -// this.roleId = roleId!=null?","+StringUtils.join(roleId,",")+",": null; -// } - public void setRoleId(Object roleId) - { - if(roleId==null) - { - this.roleId=null; - return; - } - - List list=new ArrayList<>(); - //if(roleId.getClass() == List.class) - if( roleId instanceof List){ - list = (List)roleId; - } - else if(roleId instanceof Integer) - { - list.add((Integer) roleId); - } - else if(roleId instanceof String) - { - if(isNumber((String) roleId)) - { - list.add(Integer.parseInt((String) roleId)); - } - else - { - String roles=(String)roleId; - if(roles.startsWith(",") && roles.endsWith(",")) - { - this.roleId=roles; - return; - } - } - } - else - { - list=null; - } - - if(String.valueOf(roleId).equals("-1")) - { - list=null; - } - - if(list==null || list.size()==0) - { - this.roleId=null; - } - else - { - list=SortAndRemoveRepeat(list,Integer.class); - this.roleId=","+StringUtils.join(list,",")+","; - } - - } - - public List getRoleIdList() - { - return str2intList(roleId); - } - /** - * 获取手机号 - * @return user_phone - 手机号 - */ - public String getUserPhone() { - return userPhone; - } - - /** - * 设置手机号 - * @param userPhone 手机号 - */ - public void setUserPhone(String userPhone) { - this.userPhone = userPhone; - } - - /** - * 获取登记时间 - * @return reg_time - 登记时间 - */ - public Date getRegTime() { - return regTime; - } - - /** - * 设置登记时间 - * @param regTime 登记时间 - */ - public void setRegTime(Date regTime) { - this.regTime = regTime; - } - - /** - * 获取状态（0：无效；1：有效） - * @return user_status - 状态（0：无效；1：有效） - */ - public Integer getUserStatus() { - return userStatus; - } - - /** - * 设置状态（0：无效；1：有效） - * @param userStatus 状态（-1：未审核；1：有效） - */ - public void setUserStatus(Integer userStatus) { - this.userStatus = userStatus; - } - - public String getAreacode() { - return areacode; - } - public List getAreaCodeList() - { - return str2StringList(areacode); - } - - public void setAreacode(Object areacode) { - if(areacode==null) - { - this.areacode=null; - return; - } - List list=new ArrayList<>(); - - if(areacode instanceof List) - { - list = (List)areacode; - } - else if(areacode instanceof String) - { - String db_str=(String)areacode; - if(db_str.startsWith(",") && db_str.endsWith(",")) - { - this.areacode=db_str; - return; - } - list.add((String) areacode); - } - else if(areacode instanceof Integer) - { - list.add(String.valueOf(areacode)); - } - else - { - list=null; - } - - if(String.valueOf(areacode).equals("-1")) - { - list=null; - } - - if(list==null || list.size()==0) - { - this.areacode=null; - } - else - { - list=SortAndRemoveRepeat(list,String.class); - this.areacode=","+StringUtils.join(list,",")+","; - } - } - - public String getDepartment() { - return department; - } - public List getDepartmentList() - { - return str2intList(department); - } - public void setDepartment(Object department) { - if(department==null) - { - this.department=null; - return; - } - List list=new ArrayList<>(); - - if(department instanceof List) - { - list = (List)department; - } - else if(department instanceof String) - { - if(isNumber((String) department)) - { - list.add(Integer.parseInt((String) department)); - } - else - { - String db_str=(String)department; - if(db_str.startsWith(",") && db_str.endsWith(",")) - { - this.department=db_str; - return; - } - } - - } - else if(department instanceof Integer) - { - list.add((Integer)department); - } - else - { - list=null; - } - - if(String.valueOf(department).equals("-1")) - { - list=null; - } - - if(list==null || list.size()==0) - { - this.department=null; - } - else - { - list=SortAndRemoveRepeat(list,Integer.class); - this.department=","+StringUtils.join(list,",")+","; - } - } - - public Integer getSecurity() { - return security; - } - - public void setSecurity(Integer security) { - this.security = security; - } - - - /** - * 实体类转换成字符串 - */ - @Override - public String toString() { - return "BaseAdminUser{" + - "id=" + id + - ", sysUserName='" + sysUserName + '\'' + - ", sysUserPwd='" + sysUserPwd + '\'' + - ", roleId=" + roleId + - ", userPhone='" + userPhone + '\'' + - ", regTime='" + regTime + '\'' + - ", userStatus=" + userStatus + - ", areacode='" + areacode +'\'' + - ", department=" + department + - ", security=" + security + - '}'; - } -} diff --git a/src/main/java/com/cetc32/dh/entity/Department.java b/src/main/java/com/cetc32/dh/entity/Department.java deleted file mode 100644 index dd56904..0000000 --- a/src/main/java/com/cetc32/dh/entity/Department.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.cetc32.dh.entity; - -public class Department extends NumberS{ - private Integer id; - - private String name; - - private String description; - - private Integer organizationid; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getOrganizationid(){return organizationid;} - - public void setOrganizationid(Integer organizationid1){this.organizationid=organizationid1;} -} diff --git a/src/main/java/com/cetc32/dh/entity/Organization.java b/src/main/java/com/cetc32/dh/entity/Organization.java deleted file mode 100644 index 0edf636..0000000 --- a/src/main/java/com/cetc32/dh/entity/Organization.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cetc32.dh.entity; - -public class Organization extends NumberS{ - private Integer id; - - private String name; - - private String description; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java index 04538f6..82484c1 100644 --- a/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/ProvinceGeomMapper.java @@ -1,6 +1,5 @@ package com.cetc32.dh.mybatis; -import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.ProvinceGeom; import org.springframework.stereotype.Repository; import tk.mybatis.mapper.common.Mapper; 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 99d8db2..926d903 100644 --- a/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/ProductdemandServiceImpl.java @@ -2,7 +2,6 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.dto.LineBoth; import com.cetc32.dh.dto.TwoNode; -import com.cetc32.dh.entity.AreaCommon; import com.cetc32.dh.entity.Productdemand; import com.cetc32.dh.entity.vProduct; import com.cetc32.dh.mybatis.ProductdemandMapper; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index 44aca91..0000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -#spring: -# profiles: -# active: dev diff --git a/src/main/resources/mapper/EstimateTaskMapper.xml b/src/main/resources/mapper/EstimateTaskMapper.xml index 3fd042c..fa905fb 100644 --- a/src/main/resources/mapper/EstimateTaskMapper.xml +++ b/src/main/resources/mapper/EstimateTaskMapper.xml @@ -207,12 +207,12 @@ approvtime=#{approvtime,jdbcType=TIMESTAMP}, - report =#{report} + report =#{report}, reason=#{reason,jdbcType=VARCHAR}, - changetime=now(), + changetime = now() ::timestamp , taskdes=#{taskdes,jdbcType=VARCHAR}, -- Gitee From 7d82b7fcbd9c046a7364e3aa5834de4dfac2b29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Wed, 15 Sep 2021 14:04:07 +0800 Subject: [PATCH 36/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPLP=E4=B8=ADSQL=20?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/DataPlpMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/DataPlpMapper.xml b/src/main/resources/mapper/DataPlpMapper.xml index ab70b31..4869a11 100644 --- a/src/main/resources/mapper/DataPlpMapper.xml +++ b/src/main/resources/mapper/DataPlpMapper.xml @@ -292,7 +292,7 @@ + select city ,city_code,province,province_code from city_geom + + + province_code =#{proCode} + + + order by province_code asc + + -- Gitee From 898590b7c5886ce7e116a2835f082db1152ea949 Mon Sep 17 00:00:00 2001 From: root <123> Date: Thu, 16 Sep 2021 14:44:25 +0800 Subject: [PATCH 38/45] =?UTF-8?q?2021=E5=B9=B4=209=E6=9C=8810=E6=97=A5=20d?= =?UTF-8?q?atafile=E5=85=83=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/ProvinceGeomController.java | 93 +++++++++++-------- .../cetc32/dh/service/CityGeomService.java | 9 ++ .../com/cetc32/dh/service/CityService.java | 3 + .../dh/service/ProvinceGeomService.java | 1 + .../dh/service/impl/CityGeomServiceImpl.java | 72 ++++++++++++++ .../service/impl/ProvinceGeomServiceImpl.java | 5 + 6 files changed, 144 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 0591b66..063410b 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -126,47 +126,62 @@ public class ProvinceGeomController { } - /* - 根据区域和目录id进行搜索，判断哪些记录范围和输入区域省市有交际 + + + + /** + * 根据地区名称areaName查询polygon */ - @PostMapping("/menuandpolygon") - public ResponseResult menuAndPolygon(@RequestBody Map map) { - Integer menuId = (Integer)map.get("menuId"); - String shape = (String)map.get("shape"); - Boolean jdg_polygon = true; - ProvinceGeom provinceGeom; - CityGeom cityGeom; -// shape = "POLYGON((98.5 46.5,98.7 46.5,98.7 46.7,98.5 46.7,98.5 46.5))"; - List resultFileList = new ArrayList<>(); - List regionList = new ArrayList<>(); - List dataFileList = new ArrayList<>(); - dataFileList = dataFileService.queryByMenuId(menuId); - for (int i = 0; i < dataFileList.size(); i++) { - jdg_polygon = true; - if (dataFileList.get(i).getRegion() != null && !dataFileList.get(i).getRegion().trim().isEmpty()) { - regionList = Arrays.asList(dataFileList.get(i).getRegion().split(",")); - for (int j = 0; j < regionList.size(); j++) { -// System.out.println(regionList.get(j)); - provinceGeom = provinceGeomService.queryByName(StringUtils.trim(regionList.get(j))); - if (provinceGeom != null && provinceGeom.getPolygonText() != null && shape.contains("POLYGON")) { - jdg_polygon = provinceGeomService.judgePolygonDisjoint(provinceGeom.getPolygonText(), shape); - if (!jdg_polygon) { - resultFileList.add(dataFileList.get(i)); - break; - } - } - cityGeom = cityGeomService.queryByName(StringUtils.trim(regionList.get(j))); - if (cityGeom != null && cityGeom.getPolygonText() != null && shape.contains("POLYGON")) { - jdg_polygon = provinceGeomService.judgePolygonDisjoint(cityGeom.getPolygonText(), shape); - if (!jdg_polygon) { - resultFileList.add(dataFileList.get(i)); - break; - } - } - } - } - } + @PostMapping("/areaTopolygon") + public ResponseResult areaToPolygon(@RequestBody Map map) { + List areaNames = new ArrayList<>(); + areaNames = (List) map.get("areaNames"); + Map areaPlg = null; + areaPlg = cityGeomService.areaToPolygon(areaNames); + return ResponseResult.success(areaPlg); + } + + + /** + * 根据polygons查路径 + */ + @PostMapping("/menuAndPgonCom") + public ResponseResult menuAndPgonCom(@RequestBody Map map) { + Integer menuId = (Integer) map.get("menuId"); + List polygons = new ArrayList<>(); + polygons = (List) map.get("polygons"); + Set resultFileList = null; + resultFileList = cityGeomService.menuAndPgonCom(menuId,polygons); + return ResponseResult.success(resultFileList); + } + + /** + * 根据areaNames查路径 + */ + @PostMapping("/menuAndAreaCom") + public ResponseResult menuAndAreaCom(@RequestBody Map map) { + Integer menuId = (Integer) map.get("menuId"); + List areaNames = new ArrayList<>(); + Set resultFileList = null; + areaNames = (List) map.get("areaNames"); + Collection valueCollection = cityGeomService.areaToPolygon(areaNames).values(); + List polygons = new ArrayList(valueCollection); +// for (int i = 0; i areaToPolygon(List areaNames); + + public Set menuAndPgonCom(Integer menuId,List polygons); } diff --git a/src/main/java/com/cetc32/dh/service/CityService.java b/src/main/java/com/cetc32/dh/service/CityService.java index 8bfc334..af8d09c 100644 --- a/src/main/java/com/cetc32/dh/service/CityService.java +++ b/src/main/java/com/cetc32/dh/service/CityService.java @@ -8,6 +8,7 @@ package com.cetc32.dh.service; import com.cetc32.dh.entity.City; import java.util.List; +import java.util.Map; /** * @Title: CityService @@ -43,4 +44,6 @@ public interface CityService { public List selectByCityCode(String id); + + } diff --git a/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java b/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java index a001a0d..7d4350f 100644 --- a/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java +++ b/src/main/java/com/cetc32/dh/service/ProvinceGeomService.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Map; public interface ProvinceGeomService { diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java index bc874f9..a6e49c3 100644 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java @@ -1,8 +1,13 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.entity.CityGeom; +import com.cetc32.dh.entity.DataFile; +import com.cetc32.dh.entity.ProvinceGeom; import com.cetc32.dh.mybatis.CityGeomMapper; import com.cetc32.dh.service.CityGeomService; +import com.cetc32.dh.service.DataFileService; +import com.cetc32.dh.service.ProvinceGeomService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,11 +15,19 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.util.*; @Service public class CityGeomServiceImpl implements CityGeomService { @Autowired public CityGeomMapper cityGeomMapper; + @Autowired + public ProvinceGeomService provinceGeomService; + @Autowired + public CityGeomService cityGeomService; + @Autowired + public DataFileService dataFileService; + @Override public int updateByName(CityGeom cityGeom){ @@ -52,4 +65,63 @@ public class CityGeomServiceImpl implements CityGeomService { } return sbf.toString(); } + + + @Override + public Map areaToPolygon(List areaNames){ + Map areaPlg = new HashMap<>(); + ProvinceGeom provinceGeom; + CityGeom cityGeom; + for (int i = 0; i < areaNames.size(); i++) { + provinceGeom = provinceGeomService.queryByName(areaNames.get(i)); + if (provinceGeom != null) { + areaPlg.put(areaNames.get(i), provinceGeom.getPolygonText()); + } else { + cityGeom = cityGeomService.queryByName(areaNames.get(i)); + if (cityGeom != null) { + areaPlg.put(areaNames.get(i), cityGeom.getPolygonText()); + } + } + } + return areaPlg; + } + + @Override + public Set menuAndPgonCom(Integer menuId, List polygons){ + Boolean jdg_polygon = true; + ProvinceGeom provinceGeom; + CityGeom cityGeom; + Set resultFileList = new HashSet<>(); + List regionList = new ArrayList<>(); + List dataFileList = new ArrayList<>(); + dataFileList = dataFileService.queryByMenuId(menuId); + for (int i = 0; i < dataFileList.size(); i++) { + for (int num =0;num< polygons.size();num++){ + jdg_polygon = true; + if (dataFileList.get(i).getRegion() != null && !dataFileList.get(i).getRegion().trim().isEmpty()) { + regionList = Arrays.asList(dataFileList.get(i).getRegion().split(",")); + for (int j = 0; j < regionList.size(); j++) { +// System.out.println(regionList.get(j)); + provinceGeom = provinceGeomService.queryByName(StringUtils.trim(regionList.get(j))); + if (provinceGeom != null && provinceGeom.getPolygonText() != null && polygons.get(num).contains("POLYGON")) { + jdg_polygon = provinceGeomService.judgePolygonDisjoint(provinceGeom.getPolygonText(), polygons.get(num)); + if (!jdg_polygon) { + resultFileList.add(dataFileList.get(i)); + break; + } + } + cityGeom = cityGeomService.queryByName(StringUtils.trim(regionList.get(j))); + if (cityGeom != null && cityGeom.getPolygonText() != null && polygons.get(num).contains("POLYGON")) { + jdg_polygon = provinceGeomService.judgePolygonDisjoint(cityGeom.getPolygonText(), polygons.get(num)); + if (!jdg_polygon) { + resultFileList.add(dataFileList.get(i)); + break; + } + } + } + } + } + } + return resultFileList; + } } diff --git a/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java index fab76b2..bd7008f 100644 --- a/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/ProvinceGeomServiceImpl.java @@ -29,4 +29,9 @@ public class ProvinceGeomServiceImpl implements ProvinceGeomService{ public Boolean judgePolygonDisjoint(String polygon1,String polygon2){ return provinceGeomMapper.judgePolygonDisjoint(polygon1,polygon2); } + + + + + } -- Gitee From 3eed419bceb8d75c4d160c354e6b3629a413b053 Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 17 Sep 2021 10:10:00 +0800 Subject: [PATCH 39/45] =?UTF-8?q?2021=E5=B9=B4=209=E6=9C=8810=E6=97=A5=20d?= =?UTF-8?q?atafile=E5=85=83=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/ProvinceGeomController.java | 6 ++++ .../com/cetc32/dh/mybatis/DataPlpMapper.java | 6 ++++ .../cetc32/dh/service/CityGeomService.java | 3 ++ .../com/cetc32/dh/service/DataPlpService.java | 8 +++++ .../dh/service/impl/CityGeomServiceImpl.java | 32 +++++++++++++++++++ .../dh/service/impl/DataPlpServiceImpl.java | 10 ++++++ src/main/resources/mapper/DataPlpMapper.xml | 4 +++ 7 files changed, 69 insertions(+) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 063410b..47e3328 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -151,6 +151,9 @@ public class ProvinceGeomController { List polygons = new ArrayList<>(); polygons = (List) map.get("polygons"); Set resultFileList = null; + if (menuId == 34) { + return ResponseResult.success(cityGeomService.menuAndPgonPlm(polygons)); + } resultFileList = cityGeomService.menuAndPgonCom(menuId,polygons); return ResponseResult.success(resultFileList); } @@ -170,6 +173,9 @@ public class ProvinceGeomController { // System.out.println(i+"#################"); // System.out.println(polygons.get(i)); // } + if(menuId==34){ + return ResponseResult.success(cityGeomService.menuAndPgonPlm(polygons)); + } resultFileList = cityGeomService.menuAndPgonCom(menuId,polygons); return ResponseResult.success(resultFileList); } diff --git a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java index 261b0a9..b8ddc79 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java @@ -31,6 +31,12 @@ public interface DataPlpMapper extends Mapper { */ public Integer countAll(); + /** + * 查询所有的点线面数据个数 + * + * @return 返回统计结果 + */ + public List selectAll(); /** * 插入一个点线面数据 * diff --git a/src/main/java/com/cetc32/dh/service/CityGeomService.java b/src/main/java/com/cetc32/dh/service/CityGeomService.java index 45eafaa..c3ab2f0 100644 --- a/src/main/java/com/cetc32/dh/service/CityGeomService.java +++ b/src/main/java/com/cetc32/dh/service/CityGeomService.java @@ -2,6 +2,7 @@ package com.cetc32.dh.service; import com.cetc32.dh.entity.CityGeom; import com.cetc32.dh.entity.DataFile; +import com.cetc32.dh.entity.DataPlp; import java.util.List; import java.util.Map; @@ -17,4 +18,6 @@ public interface CityGeomService { public Map areaToPolygon(List areaNames); public Set menuAndPgonCom(Integer menuId,List polygons); + + public Set menuAndPgonPlm(List polygons); } diff --git a/src/main/java/com/cetc32/dh/service/DataPlpService.java b/src/main/java/com/cetc32/dh/service/DataPlpService.java index d13672a..46d1d8f 100644 --- a/src/main/java/com/cetc32/dh/service/DataPlpService.java +++ b/src/main/java/com/cetc32/dh/service/DataPlpService.java @@ -35,6 +35,14 @@ public interface DataPlpService { */ public Integer countAll(); + + /** + * 查询所有的点线面数据个数 + * + * @return 返回统计结果 + */ + public List selectAll(); + /** * 插入一个点线面数据 * diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java index a6e49c3..cb7e4f7 100644 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java @@ -2,10 +2,12 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.entity.CityGeom; import com.cetc32.dh.entity.DataFile; +import com.cetc32.dh.entity.DataPlp; import com.cetc32.dh.entity.ProvinceGeom; import com.cetc32.dh.mybatis.CityGeomMapper; import com.cetc32.dh.service.CityGeomService; import com.cetc32.dh.service.DataFileService; +import com.cetc32.dh.service.DataPlpService; import com.cetc32.dh.service.ProvinceGeomService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +29,8 @@ public class CityGeomServiceImpl implements CityGeomService { public CityGeomService cityGeomService; @Autowired public DataFileService dataFileService; + @Autowired + public DataPlpService dataPlpService; @Override @@ -124,4 +128,32 @@ public class CityGeomServiceImpl implements CityGeomService { } return resultFileList; } + + + @Override + public Set menuAndPgonPlm(List polygons) { + Boolean jdg_polygon = true; + String area; + Set resultFileList = new HashSet<>(); + List dataPlpList = new ArrayList<>(); + dataPlpList = dataPlpService.selectAll(); + for (int i = 0; i < dataPlpList.size(); i++) { + area = dataPlpList.get(i).getPoints(); + if (area.toLowerCase().contains("polygon")) { + for (int num = 0; num < polygons.size(); num++) { + jdg_polygon = true; + jdg_polygon = provinceGeomService.judgePolygonDisjoint(area, polygons.get(num)); + if (!jdg_polygon) { + resultFileList.add(dataPlpList.get(i)); + break; + } + } + } + + } + return resultFileList; + } + + + } diff --git a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java index c9b0bef..719cba5 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java @@ -51,6 +51,16 @@ public class DataPlpServiceImpl implements DataPlpService { return dataPlpMapper.countAll(); } + /** + * 查询所有的点线面数据个数 + * + * @return 返回统计结果 + */ + @Override + public List selectAll(){ + return dataPlpMapper.selectAll(); + } + /** * 插入一个点线面数据 diff --git a/src/main/resources/mapper/DataPlpMapper.xml b/src/main/resources/mapper/DataPlpMapper.xml index c17d65a..febc6be 100644 --- a/src/main/resources/mapper/DataPlpMapper.xml +++ b/src/main/resources/mapper/DataPlpMapper.xml @@ -28,6 +28,10 @@ SELECT count(*) FROM data_plp + + insert into data_plp -- Gitee From 676ac9782a3fb8f75d5922ecc88d555749e2f2cd Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 17 Sep 2021 10:36:38 +0800 Subject: [PATCH 40/45] =?UTF-8?q?2021=E5=B9=B4=209=E6=9C=8810=E6=97=A5=20d?= =?UTF-8?q?atafile=E5=85=83=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java index cb7e4f7..5db3067 100644 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java @@ -139,7 +139,7 @@ public class CityGeomServiceImpl implements CityGeomService { dataPlpList = dataPlpService.selectAll(); for (int i = 0; i < dataPlpList.size(); i++) { area = dataPlpList.get(i).getPoints(); - if (area.toLowerCase().contains("polygon")) { + if (area!=null&&area.toLowerCase().contains("polygon")) { for (int num = 0; num < polygons.size(); num++) { jdg_polygon = true; jdg_polygon = provinceGeomService.judgePolygonDisjoint(area, polygons.get(num)); -- Gitee From e5cd93c11b2c04e9b2302a0dcd3da82bdbde188d Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 17 Sep 2021 10:58:13 +0800 Subject: [PATCH 41/45] =?UTF-8?q?2021=E5=B9=B4=209=E6=9C=8810=E6=97=A5=20d?= =?UTF-8?q?atafile=E5=85=83=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/rest/ProvinceGeomController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 47e3328..b7294a9 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -145,8 +145,8 @@ public class ProvinceGeomController { /** * 根据polygons查路径 */ - @PostMapping("/menuAndPgonCom") - public ResponseResult menuAndPgonCom(@RequestBody Map map) { + @PostMapping("/menuAndPgon") + public ResponseResult menuAndPgon(@RequestBody Map map) { Integer menuId = (Integer) map.get("menuId"); List polygons = new ArrayList<>(); polygons = (List) map.get("polygons"); @@ -161,8 +161,8 @@ public class ProvinceGeomController { /** * 根据areaNames查路径 */ - @PostMapping("/menuAndAreaCom") - public ResponseResult menuAndAreaCom(@RequestBody Map map) { + @PostMapping("/menuAndArea") + public ResponseResult menuAndArea(@RequestBody Map map) { Integer menuId = (Integer) map.get("menuId"); List areaNames = new ArrayList<>(); Set resultFileList = null; -- Gitee From e27de1f73e72df9c8163e4373cde4390fd75cdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Fri, 17 Sep 2021 11:23:41 +0800 Subject: [PATCH 42/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/mybatis/CityGeomMapper.java | 4 ++ .../cetc32/dh/service/CityGeomService.java | 17 +++++++ .../dh/service/impl/CityGeomServiceImp.java | 45 ------------------- .../dh/service/impl/CityGeomServiceImpl.java | 35 ++++++++++++--- src/main/resources/mapper/CityGeomMapper.xml | 21 +++++++++ 5 files changed, 70 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImp.java diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java index e0382e8..0b6da62 100644 --- a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java @@ -17,4 +17,8 @@ import java.util.List; @Repository public interface CityGeomMapper extends Mapper { List selectCityTree(@Param("proCode")String proCode) ; + + public int updateByName(CityGeom cityGeom); + + public CityGeom queryByName(String name); } diff --git a/src/main/java/com/cetc32/dh/service/CityGeomService.java b/src/main/java/com/cetc32/dh/service/CityGeomService.java index 53e17b0..5bac78f 100644 --- a/src/main/java/com/cetc32/dh/service/CityGeomService.java +++ b/src/main/java/com/cetc32/dh/service/CityGeomService.java @@ -8,10 +8,27 @@ package com.cetc32.dh.service; import com.cetc32.dh.common.TreeData; +import com.cetc32.dh.entity.CityGeom; +import com.cetc32.dh.entity.DataFile; +import com.cetc32.dh.entity.DataPlp; import java.util.List; +import java.util.Map; +import java.util.Set; public interface CityGeomService { List selectTreeData(String proCode); + + public int updateByName(CityGeom cityGeom); + + public String readFileContent(String fileName); + + public CityGeom queryByName(String name); + + public Map areaToPolygon(List areaNames); + + public Set menuAndPgonCom(Integer menuId, List polygons); + + public Set menuAndPgonPlm(List polygons); } diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImp.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImp.java deleted file mode 100644 index d4d6294..0000000 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImp.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright（C） CETC-32 - * @Description： - * @Author ：徐文远 - * @version：1.0 - * @date ： 2021/9/15 下午2:31 - ******************************************************************************/ -package com.cetc32.dh.service.impl; - -import com.cetc32.dh.common.TreeData; -import com.cetc32.dh.entity.CityGeom; -import com.cetc32.dh.mybatis.CityGeomMapper; -import com.cetc32.dh.service.CityGeomService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class CityGeomServiceImp implements CityGeomService { - @Autowired - CityGeomMapper cityGeomMapper; - @Override - public List selectTreeData(String proCode) { - List cityGeoms = cityGeomMapper.selectCityTree(proCode); - List data = new ArrayList<>(); - for(CityGeom city : cityGeoms){ - //TreeData root =new TreeData(city); - //System.out.println(data); - if(data.size()>0){ - TreeData parent = null; - for(TreeData leaf:data){ - parent =leaf.addChildren(city); - } - if(null == parent){ - data.add(new TreeData(city)); - } - }else { - data.add(new TreeData(city)); - } - } - return data; - } -} diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java index 5db3067..7018691 100644 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java @@ -1,5 +1,6 @@ package com.cetc32.dh.service.impl; +import com.cetc32.dh.common.TreeData; import com.cetc32.dh.entity.CityGeom; import com.cetc32.dh.entity.DataFile; import com.cetc32.dh.entity.DataPlp; @@ -26,13 +27,33 @@ public class CityGeomServiceImpl implements CityGeomService { @Autowired public ProvinceGeomService provinceGeomService; @Autowired - public CityGeomService cityGeomService; - @Autowired public DataFileService dataFileService; @Autowired public DataPlpService dataPlpService; + @Override + public List selectTreeData(String proCode) { + List cityGeoms = cityGeomMapper.selectCityTree(proCode); + List data = new ArrayList<>(); + for(CityGeom city : cityGeoms){ + //TreeData root =new TreeData(city); + //System.out.println(data); + if(data.size()>0){ + TreeData parent = null; + for(TreeData leaf:data){ + parent =leaf.addChildren(city); + } + if(null == parent){ + data.add(new TreeData(city)); + } + }else { + data.add(new TreeData(city)); + } + } + return data; + } + @Override public int updateByName(CityGeom cityGeom){ return cityGeomMapper.updateByName(cityGeom); @@ -81,9 +102,9 @@ public class CityGeomServiceImpl implements CityGeomService { if (provinceGeom != null) { areaPlg.put(areaNames.get(i), provinceGeom.getPolygonText()); } else { - cityGeom = cityGeomService.queryByName(areaNames.get(i)); + cityGeom = cityGeomMapper.queryByName(areaNames.get(i)); if (cityGeom != null) { - areaPlg.put(areaNames.get(i), cityGeom.getPolygonText()); + areaPlg.put(areaNames.get(i), cityGeom.getPolygon_text()); } } } @@ -114,9 +135,9 @@ public class CityGeomServiceImpl implements CityGeomService { break; } } - cityGeom = cityGeomService.queryByName(StringUtils.trim(regionList.get(j))); - if (cityGeom != null && cityGeom.getPolygonText() != null && polygons.get(num).contains("POLYGON")) { - jdg_polygon = provinceGeomService.judgePolygonDisjoint(cityGeom.getPolygonText(), polygons.get(num)); + cityGeom = cityGeomMapper.queryByName(StringUtils.trim(regionList.get(j))); + if (cityGeom != null && cityGeom.getPolygon_text() != null && polygons.get(num).contains("POLYGON")) { + jdg_polygon = provinceGeomService.judgePolygonDisjoint(cityGeom.getPolygon_text(), polygons.get(num)); if (!jdg_polygon) { resultFileList.add(dataFileList.get(i)); break; diff --git a/src/main/resources/mapper/CityGeomMapper.xml b/src/main/resources/mapper/CityGeomMapper.xml index 1137f94..bb5f575 100644 --- a/src/main/resources/mapper/CityGeomMapper.xml +++ b/src/main/resources/mapper/CityGeomMapper.xml @@ -17,4 +17,25 @@ order by province_code asc + + + update city_geom + + + geom = ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326), + polygon_text = st_astext(ST_geomfromtext(#{geom,jdbcType=VARCHAR},4326)), + + + + geom = ST_geomfromtext(#{polygonText,jdbcType=VARCHAR},4326), + polygon_text = #{polygonText,jdbcType=VARCHAR}, + + + where city = #{city,jdbcType=VARCHAR} + + + -- Gitee From 15445f6d5284ad9e65e82838259f7079464ff64d Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 17 Sep 2021 15:05:39 +0800 Subject: [PATCH 43/45] =?UTF-8?q?2021=E5=B9=B4=209=E6=9C=8810=E6=97=A5=20d?= =?UTF-8?q?atafile=E5=85=83=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/ProvinceGeomController.java | 6 ++-- .../java/com/cetc32/dh/entity/CityGeom.java | 34 +++++++++---------- .../dh/service/impl/CityGeomServiceImpl.java | 8 +++-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 5054ed8..13bc2bd 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -131,8 +131,10 @@ public class ProvinceGeomController { */ @PostMapping("/areaTopolygon") public ResponseResult areaToPolygon(@RequestBody Map map) { - List areaNames = new ArrayList<>(); - areaNames = (List) map.get("areaNames"); + String area = (String) map.get("areaNames"); + List areaNames =Arrays.asList(area.split(",")); +// List areaNames = new ArrayList<>(); +// areaNames = (List) map.get("areaNames"); Map areaPlg = null; areaPlg = cityGeomService.areaToPolygon(areaNames); return ResponseResult.success(areaPlg); diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java index 8fdb88d..7480667 100644 --- a/src/main/java/com/cetc32/dh/entity/CityGeom.java +++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java @@ -20,16 +20,16 @@ public class CityGeom implements TreeNode { @Id @Column(name = "city_code") - private String city_code; + private String cityCode; @Column( name ="province_code") - private String province_code; + private String provinceCode; @Column( name ="province") private String province; @Column( name ="polygon_text") - private String polygon_text; + private String polygonText; public String getCity() { return city; @@ -39,20 +39,20 @@ public class CityGeom implements TreeNode { this.city = city; } - public String getCity_code() { - return city_code; + public String getCityCode() { + return cityCode; } - public void setCity_code(String city_code) { - this.city_code = city_code; + public void setCityCode(String cityCode) { + this.cityCode = cityCode; } - public String getProvince_code() { - return province_code; + public String getProvinceCode() { + return provinceCode; } - public void setProvince_code(String province_code) { - this.province_code = province_code; + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; } public String getProvince() { @@ -63,17 +63,17 @@ public class CityGeom implements TreeNode { this.province = province; } - public String getPolygon_text() { - return polygon_text; + public String getPolygonText() { + return polygonText; } - public void setPolygon_text(String polygon_text) { - this.polygon_text = polygon_text; + public void setPolygonText(String polygonText) { + this.polygonText = polygonText; } @Override public String getKey() { - return city_code; + return cityCode; } @Override @@ -88,6 +88,6 @@ public class CityGeom implements TreeNode { @Override public String getParentKey() { - return province_code; + return provinceCode; } } diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java index 7018691..6a362c5 100644 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java @@ -104,7 +104,9 @@ public class CityGeomServiceImpl implements CityGeomService { } else { cityGeom = cityGeomMapper.queryByName(areaNames.get(i)); if (cityGeom != null) { - areaPlg.put(areaNames.get(i), cityGeom.getPolygon_text()); + areaPlg.put(areaNames.get(i), cityGeom.getPolygonText()); + }else{ + areaPlg.put(areaNames.get(i), null); } } } @@ -136,8 +138,8 @@ public class CityGeomServiceImpl implements CityGeomService { } } cityGeom = cityGeomMapper.queryByName(StringUtils.trim(regionList.get(j))); - if (cityGeom != null && cityGeom.getPolygon_text() != null && polygons.get(num).contains("POLYGON")) { - jdg_polygon = provinceGeomService.judgePolygonDisjoint(cityGeom.getPolygon_text(), polygons.get(num)); + if (cityGeom != null && cityGeom.getPolygonText() != null && polygons.get(num).contains("POLYGON")) { + jdg_polygon = provinceGeomService.judgePolygonDisjoint(cityGeom.getPolygonText(), polygons.get(num)); if (!jdg_polygon) { resultFileList.add(dataFileList.get(i)); break; -- Gitee From f1c2648dccc0621589feaadf17ed3a0d49a108a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=8C=E5=93=A5=E5=9C=A8=E4=B8=8A=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E9=80=80=E6=95=A3=EF=BC=8C=E6=80=A5=E6=80=A5=E5=A6=82?= =?UTF-8?q?=E5=BE=8B=E4=BB=A4=EF=BC=81?= <393696201@qq.com> Date: Fri, 17 Sep 2021 15:09:36 +0800 Subject: [PATCH 44/45] =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=8A=E6=B7=BB=E5=8A=A0loginskiped?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/OtherInterfaceController.java | 2 ++ .../java/com/cetc32/dh/entity/CityGeom.java | 22 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) 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 4ee6500..e8db23b 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -108,6 +108,7 @@ public class OtherInterfaceController { } + @LoginSkipped @ApiOperation(value = "生产任务状态反馈") @PostMapping("/callback/product") public ResponseData callbackProduct(@RequestBody Map req) @@ -243,6 +244,7 @@ public class OtherInterfaceController { } + @LoginSkipped @ApiOperation(value = "成果数据上报") @PostMapping("/import/gain") public ResponseData DataGain(@RequestBody DataFile dataFile) { diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java index 8fdb88d..49ea63c 100644 --- a/src/main/java/com/cetc32/dh/entity/CityGeom.java +++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java @@ -20,16 +20,16 @@ public class CityGeom implements TreeNode { @Id @Column(name = "city_code") - private String city_code; + private String cityCode; @Column( name ="province_code") - private String province_code; + private String provinceCode; @Column( name ="province") private String province; @Column( name ="polygon_text") - private String polygon_text; + private String polygonText; public String getCity() { return city; @@ -40,19 +40,19 @@ public class CityGeom implements TreeNode { } public String getCity_code() { - return city_code; + return cityCode; } public void setCity_code(String city_code) { - this.city_code = city_code; + this.cityCode = city_code; } public String getProvince_code() { - return province_code; + return provinceCode; } public void setProvince_code(String province_code) { - this.province_code = province_code; + this.provinceCode = province_code; } public String getProvince() { @@ -64,16 +64,16 @@ public class CityGeom implements TreeNode { } public String getPolygon_text() { - return polygon_text; + return polygonText; } public void setPolygon_text(String polygon_text) { - this.polygon_text = polygon_text; + this.polygonText = polygon_text; } @Override public String getKey() { - return city_code; + return cityCode; } @Override @@ -88,6 +88,6 @@ public class CityGeom implements TreeNode { @Override public String getParentKey() { - return province_code; + return provinceCode; } } -- Gitee From 4420529ddf159f48209b134d701676a0707ba72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=8C=E5=93=A5=E5=9C=A8=E4=B8=8A=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E9=80=80=E6=95=A3=EF=BC=8C=E6=80=A5=E6=80=A5=E5=A6=82?= =?UTF-8?q?=E5=BE=8B=E4=BB=A4=EF=BC=81?= <393696201@qq.com> Date: Fri, 17 Sep 2021 16:29:48 +0800 Subject: [PATCH 45/45] =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=8A=E6=B7=BB=E5=8A=A0loginskiped?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/ProvinceGeomController.java | 4 ++-- src/main/java/com/cetc32/dh/entity/CityGeom.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java index 13bc2bd..ef7ddfb 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProvinceGeomController.java @@ -129,12 +129,12 @@ public class ProvinceGeomController { /** * 根据地区名称areaName查询polygon */ - @PostMapping("/areaTopolygon") + @PostMapping(value = "/areaTopolygon" , produces = "application/json;charset=UTF-8") public ResponseResult areaToPolygon(@RequestBody Map map) { String area = (String) map.get("areaNames"); List areaNames =Arrays.asList(area.split(",")); // List areaNames = new ArrayList<>(); -// areaNames = (List) map.get("areaNames"); +// areaNames = (List) map.get("areaNames");s Map areaPlg = null; areaPlg = cityGeomService.areaToPolygon(areaNames); return ResponseResult.success(areaPlg); diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java index 49ea63c..714a0ea 100644 --- a/src/main/java/com/cetc32/dh/entity/CityGeom.java +++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java @@ -39,19 +39,19 @@ public class CityGeom implements TreeNode { this.city = city; } - public String getCity_code() { + public String getCityCode() { return cityCode; } - public void setCity_code(String city_code) { + public void setCityCode(String city_code) { this.cityCode = city_code; } - public String getProvince_code() { + public String getProvinceCode() { return provinceCode; } - public void setProvince_code(String province_code) { + public void setProvinceCode(String province_code) { this.provinceCode = province_code; } @@ -63,11 +63,11 @@ public class CityGeom implements TreeNode { this.province = province; } - public String getPolygon_text() { + public String getPolygonText() { return polygonText; } - public void setPolygon_text(String polygon_text) { + public void setPolygonText(String polygon_text) { this.polygonText = polygon_text; } -- Gitee