From c87c0b189bd16129655bb89aaea6ad3eae2c3cfa Mon Sep 17 00:00:00 2001 From: hpc Date: Tue, 8 Dec 2020 20:08:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E6=B3=A8?= =?UTF-8?q?=E9=94=80=202=E3=80=81=E7=94=A8=E6=88=B7Token=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=203=E3=80=81=E6=88=90=E6=9E=9C=E6=95=B0=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dh/controller/rest/AuthController.java | 86 +++++++++++++---- .../controller/rest/FileSubmitController.java | 13 +++ .../java/com/cetc32/dh/entity/DataFile.java | 1 + .../com/cetc32/dh/mybatis/DataFileMapper.java | 3 + .../cetc32/dh/service/DataFileService.java | 2 + .../dh/service/impl/DataFileServiceImpl.java | 11 +++ src/main/resources/mapper/DataFileMapper.xml | 95 +++++++++++++++++++ 7 files changed, 193 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java index 762aba9..d02caf8 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java @@ -11,6 +11,7 @@ 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.beans.UserInfo; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; @@ -66,7 +67,7 @@ public class AuthController { /** * 用户登陆 * @param loginParameter "包含username和password的json字符串" - * @return ResponseResult + * @return ResponseData * 备注:无 */ @ApiOperation(value = "用户登录验证，并返回用户相应角色", notes = "") @@ -90,7 +91,6 @@ public class AuthController { long currentTimeMillis = System.currentTimeMillis(); String token= JWTUtil.createToken(username,currentTimeMillis); redisUtil.set(username,currentTimeMillis,60*30); - long t=JWTUtil.getExpire(token); LoginResult data=new LoginResult(token, user.getDepartment(), username, @@ -238,33 +238,83 @@ public class AuthController { @ApiOperation(value = "获取角色列表", notes = "") @GetMapping(value = "/roles") - public ResponseResult getRoles(){ - return ResponseResult.success(adminRoleService.getAllRoles()); + public ResponseData getRoles(){ + return ResponseData.success(adminRoleService.getAllRoles()); } + /** - * 非授权用户登陆 - * @param message - * @return ResponseResult + * 注销 + * @param token + * @return ResponseData * 备注:无 */ - @PostMapping(path = "/unauthorized/{message}") - public ResponseResult unauthorized(@PathVariable String message) throws UnsupportedEncodingException { - return ResponseResult.fail(message); + @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 request + * @param token + * @return ResponseData + * 备注:无 + */ + @ApiOperation(value = "token校验", notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "登陆成功返回的token", paramType = "String"), + }) + @PostMapping("/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(); + long exp=JWTUtil.getExpire(token); + if(exp0) + { + return ResponseData.success(); + } + return ResponseData.error("上报失败！"); + + } + + // /** // * @param page 页码 diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java index c47e76f..20a88cc 100644 --- a/src/main/java/com/cetc32/dh/entity/DataFile.java +++ b/src/main/java/com/cetc32/dh/entity/DataFile.java @@ -59,6 +59,7 @@ public class DataFile extends NumberS { this.fileConfig = fileConfig; this.approveTime = approveTime; } + /** * 数据id,文件(夹)id */ diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java index 4497d08..cd55567 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java @@ -3,10 +3,12 @@ package com.cetc32.dh.mybatis; import com.cetc32.dh.entity.DataFile; import com.cetc32.dh.entity.DataSubmit; import com.cetc32.dh.entity.VfileMenu; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import tk.mybatis.mapper.common.Mapper; +import java.security.PublicKey; import java.util.Date; import java.util.List; @@ -15,6 +17,7 @@ public interface DataFileMapper extends Mapper { public Integer countAll(); public Integer insertOne(DataFile dataFile); + public Integer insertGain(DataFile dataFile); public Integer updateById(DataFile dataFile); diff --git a/src/main/java/com/cetc32/dh/service/DataFileService.java b/src/main/java/com/cetc32/dh/service/DataFileService.java index 5b49c8d..d685db7 100644 --- a/src/main/java/com/cetc32/dh/service/DataFileService.java +++ b/src/main/java/com/cetc32/dh/service/DataFileService.java @@ -29,6 +29,8 @@ public interface DataFileService { public Integer insertDataFile(DataFile dataFile); + public Integer insertGain(DataFile dataFile); + public Integer updatebyId(DataFile dataFile); public Integer deleteById(Long id); 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 077889f..c0c87b6 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java @@ -57,6 +57,17 @@ public class DataFileServiceImpl implements DataFileService { return dataFileMapper.insertOne(dataFile); } + /** + * 成果数据上报 + * @param dataFile + * @return Integer + */ + @Override + public Integer insertGain(DataFile dataFile){ + return dataFileMapper.insertGain(dataFile); + } + + /** * 更新文件 * @param dataFile diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml index 3954577..4eb2235 100644 --- a/src/main/resources/mapper/DataFileMapper.xml +++ b/src/main/resources/mapper/DataFileMapper.xml @@ -210,6 +210,101 @@ + + insert into data_file + + + + file_name, + + + + file_type, + + + + file_path, + + + create_time, + + + region, + + + + file_time, + + + + file_size, + + + + gcs, + + + + scan_level, + + + + scale, + + + + file_config, + + + + + + + + + #{fileName ,jdbcType=VARCHAR}, + + + + #{fileType,jdbcType=VARCHAR}, + + + + #{filePath,jdbcType=VARCHAR}, + + + now(), + + + #{region,jdbcType=VARCHAR}, + + + + #{fileTime,jdbcType=VARCHAR}, + + + + #{fileSize,jdbcType=VARCHAR}, + + + + #{gcs,jdbcType=VARCHAR}, + + + + #{scanLevel,jdbcType=INTEGER}, + + + + #{scale,jdbcType=VARCHAR}, + + + + #{fileConfig,jdbcType=VARCHAR}, + + + + update data_file -- Gitee From adc61ab3abc9fcf72b371ee16c6ec08706d32873 Mon Sep 17 00:00:00 2001 From: hpc Date: Thu, 10 Dec 2020 11:23:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/beans/DataCollected.java | 72 +++++++++++++++++ .../com/cetc32/dh/beans/LoginParameter.java | 2 + .../java/com/cetc32/dh/beans/LoginResult.java | 1 + .../cetc32/dh/beans/ResultDataCollected.java | 76 +++++++++++++++++ .../controller/rest/FileSubmitController.java | 43 ++++++++++ .../java/com/cetc32/dh/entity/DataFile.java | 11 +++ .../com/cetc32/dh/mybatis/DataPlpMapper.java | 10 +++ .../cetc32/dh/service/DataPlpServices.java | 14 ++++ .../dh/service/impl/DataPlpServiceImpl.java | 29 +++++++ src/main/resources/mapper/DataFileMapper.xml | 18 ++++- src/main/resources/mapper/DataPlpMapper.xml | 81 +++++++++++++++++++ 11 files changed, 353 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/cetc32/dh/beans/DataCollected.java create mode 100644 src/main/java/com/cetc32/dh/beans/ResultDataCollected.java create mode 100644 src/main/java/com/cetc32/dh/service/DataPlpServices.java create mode 100644 src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java diff --git a/src/main/java/com/cetc32/dh/beans/DataCollected.java b/src/main/java/com/cetc32/dh/beans/DataCollected.java new file mode 100644 index 0000000..8d8c10a --- /dev/null +++ b/src/main/java/com/cetc32/dh/beans/DataCollected.java @@ -0,0 +1,72 @@ +package com.cetc32.dh.beans; + +import java.util.Date; + +public class DataCollected { + private Integer userid; + private String eventtype; + private String points; + private String cityname; + private Date uploadtime; + private String describe; + private byte[] photo; + + + + 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; + } + + public byte[] getPhoto() { + return photo; + } + + public void setPhoto(byte[] photo) { + this.photo = photo; + } + +} diff --git a/src/main/java/com/cetc32/dh/beans/LoginParameter.java b/src/main/java/com/cetc32/dh/beans/LoginParameter.java index 66a1a74..14270aa 100644 --- a/src/main/java/com/cetc32/dh/beans/LoginParameter.java +++ b/src/main/java/com/cetc32/dh/beans/LoginParameter.java @@ -4,6 +4,7 @@ public class LoginParameter { private String username; private String password; + public String getUsername() { return username; } @@ -19,4 +20,5 @@ public class LoginParameter { public void setPassword(String password) { this.password = password; } + } diff --git a/src/main/java/com/cetc32/dh/beans/LoginResult.java b/src/main/java/com/cetc32/dh/beans/LoginResult.java index c3c7450..968dee5 100644 --- a/src/main/java/com/cetc32/dh/beans/LoginResult.java +++ b/src/main/java/com/cetc32/dh/beans/LoginResult.java @@ -16,6 +16,7 @@ public class LoginResult { private List areacode; private long expriation; + public String getToken() { return token; } diff --git a/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java b/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java new file mode 100644 index 0000000..2c0692d --- /dev/null +++ b/src/main/java/com/cetc32/dh/beans/ResultDataCollected.java @@ -0,0 +1,76 @@ +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/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java index b0c44a7..1c76933 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java @@ -9,6 +9,7 @@ */ package com.cetc32.dh.controller.rest; +import com.cetc32.dh.beans.DataCollected; import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; @@ -17,6 +18,7 @@ import com.cetc32.dh.entity.DataSubmit; import com.cetc32.dh.entity.FileToMenu; import com.cetc32.dh.entity.VfileMenu; import com.cetc32.dh.service.*; +import com.cetc32.dh.service.impl.DataPlpServiceImpl; import com.cetc32.dh.utils.FileUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -31,6 +33,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -54,6 +58,9 @@ public class FileSubmitController { @Autowired AdminUserService adminUserService; + @Autowired + DataPlpServiceImpl dataPlpService; + @Value("${upLoadPath}") String upLoadPath; @@ -712,6 +719,42 @@ public class FileSubmitController { } + @ApiOperation(value = "采集数据上报") + @PostMapping("/collection") + public ResponseData DataCollection(@RequestBody DataCollected data) { + if(dataPlpService.insertCollected(data)>0) + { + return ResponseData.success(); + } + return ResponseData.error("上报失败！"); + + } + + @ApiOperation(value = "数据获取",notes = "数据获取获取指定时间空间数据") + @GetMapping(value = "/ploygon") + public ResponseData DataPloygon(@RequestBody Map map) { + SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd" ); + Date startTime; + Date endTime; + try { + startTime=map.get("starttime")==null?null:sdf.parse((String)map.get("starttime")); + endTime=map.get("endtime")==null?null:sdf.parse((String)map.get("endtime")); + } catch (ParseException e) { + + return ResponseData.error("日期格式有误（允许格式为：yyyy-MM-dd）"); + } + String polygon=map.get("polygon")==null?null:(String) map.get("polygon"); + if(polygon==null) + { + return ResponseData.error("缺少参数 polygon "); + } + return ResponseData.success(dataPlpService.selectPloygon(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 20a88cc..20024c9 100644 --- a/src/main/java/com/cetc32/dh/entity/DataFile.java +++ b/src/main/java/com/cetc32/dh/entity/DataFile.java @@ -189,6 +189,17 @@ public class DataFile extends NumberS { @Column(name = "approve_time") private Date approveTime; + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + @Column(name = "area") + private String area; + Integer userId; diff --git a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java index 5b40138..0d6da0b 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataPlpMapper.java @@ -1,18 +1,28 @@ package com.cetc32.dh.mybatis; +import com.cetc32.dh.beans.DataCollected; +import com.cetc32.dh.beans.ResultDataCollected; import com.cetc32.dh.entity.DataFile; import com.cetc32.dh.entity.DataPlp; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import tk.mybatis.mapper.common.Mapper; import java.util.Date; import java.util.List; +@Repository public interface DataPlpMapper extends Mapper { public Integer countAll(); public Integer insertOne(DataPlp dataPlp); + public Integer insertCollected(DataCollected data); + + public List selectPloygon(@Param("startTime") Date startTime, + @Param("endTime") Date endTime, + @Param("polygon") String polygon); + public Integer updateById(DataPlp dataPlp); public Integer deleteById(Integer id); diff --git a/src/main/java/com/cetc32/dh/service/DataPlpServices.java b/src/main/java/com/cetc32/dh/service/DataPlpServices.java new file mode 100644 index 0000000..4416618 --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/DataPlpServices.java @@ -0,0 +1,14 @@ +package com.cetc32.dh.service; + +import com.cetc32.dh.beans.DataCollected; +import com.cetc32.dh.beans.ResultDataCollected; + + +import java.util.Date; +import java.util.List; + +public interface DataPlpServices { + public Integer insertCollected(DataCollected data); + + public List selectPloygon(Date startTime, Date endTime, String polygon); +} diff --git a/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java new file mode 100644 index 0000000..df18c0d --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/impl/DataPlpServiceImpl.java @@ -0,0 +1,29 @@ +package com.cetc32.dh.service.impl; + +import com.cetc32.dh.beans.DataCollected; +import com.cetc32.dh.beans.ResultDataCollected; +import com.cetc32.dh.mybatis.DataPlpMapper; +import com.cetc32.dh.service.DataPlpServices; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + + +@Service +public class DataPlpServiceImpl implements DataPlpServices { + + @Autowired + DataPlpMapper dataPlpMapper; + + @Override + public Integer insertCollected(DataCollected data) { + return dataPlpMapper.insertCollected(data); + } + @Override + public List selectPloygon(Date startTime, Date endTime, String polygon) + { + return dataPlpMapper.selectPloygon(startTime,endTime,polygon); + } +} diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml index 4eb2235..801a4a4 100644 --- a/src/main/resources/mapper/DataFileMapper.xml +++ b/src/main/resources/mapper/DataFileMapper.xml @@ -28,6 +28,7 @@ + + select userid,file_type as eventtype,points,region as cityname,create_time as uploadtime,description as describe,photo_byte from data_plp + where 1 = 1 + + and create_time >= #{startTime} + + + and create_time <= #{endTime} + + + and points = #{polygon} + + + update data_plp -- Gitee From 996a5c79e3a935d5fa10086b3427416f9e4b018e Mon Sep 17 00:00:00 2001 From: hpc Date: Thu, 10 Dec 2020 11:38:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/controller/rest/FileSubmitController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java index 1c76933..d4bea40 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java @@ -744,9 +744,9 @@ public class FileSubmitController { return ResponseData.error("日期格式有误（允许格式为：yyyy-MM-dd）"); } String polygon=map.get("polygon")==null?null:(String) map.get("polygon"); - if(polygon==null) + if(polygon==null || polygon.length()==0) { - return ResponseData.error("缺少参数 polygon "); + return ResponseData.error("参数 polygon 不能为空"); } return ResponseData.success(dataPlpService.selectPloygon(startTime,endTime,polygon)); } -- Gitee