Skip to content

M
map-parent
Commit 6f67e001 by YANGYANG
Options

用户新增修改 提交

parent 2190561d
Showing with 174 additions and 48 deletions
common/common_utils/src/main/java/com/founder/commonutils/ZdryApiEntity/OnlineAndWear.java 0 → 100644
package com.founder.commonutils.ZdryApiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author yangyang
* @since 2021-06-01
*/
@Data
@ApiModel(value="OnlineAndWear对象", description="OnlineAndWear对象")
public class OnlineAndWear implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备Imei")
private String id;
@ApiModelProperty(value = "是否在线 1在线 0离线")
private String online;
@ApiModelProperty(value = "是否佩戴 1佩戴 0位佩戴")
private String WearFlag;
@ApiModelProperty(value = "最新发生时间")
private String locationUpdatedAt;
@ApiModelProperty(value = "最新位置经度")
private String lastLocationX;
@ApiModelProperty(value = "最新位置纬度")
private String lastLocationY;
@ApiModelProperty(value = "最新位置地址")
private String lastAddress;
@ApiModelProperty(value = "姓名")
private String xm;
}
common/common_utils/src/main/java/com/founder/commonutils/zdryEntity/Users.java
......@@ -22,10 +22,14 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="Users对象", description="")
@ApiModel(value="gk_users对象", description="gk_users对象")
@TableName("gk_users")
public class Users implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "信息主键编号自增长")
@TableId(type = IdType.AUTO)
private Integer xxzjbh;
@ApiModelProperty(value = "姓名")
private String xm;
......@@ -73,7 +77,6 @@ public class Users implements Serializable {
private String jhr2Jjdh;
@ApiModelProperty(value = "设备IMEI")
@TableId(value = "sb_imei", type = IdType.ID_WORKER_STR)
private String sbImei;
@ApiModelProperty(value = "设备型号")
......@@ -90,5 +93,6 @@ public class Users implements Serializable {
@ApiModelProperty(value = "信息删除判断标志 1删除 0未删除")
private Integer xxscPdbz;
@ApiModelProperty(value = "身份证号码")
private String sfzhm;
}
service/zdry/src/main/java/com/founder/zdry/controller/UsersController.java
......@@ -48,14 +48,16 @@ public class UsersController {
@ApiParam(name = "xm", value = "姓名")
@RequestParam(required = false) String xm,
@ApiParam(name = "bs", value = "病史", required = false)
@ApiParam(name = "bs", value = "病史")
@RequestParam(required = false) String bs,
@ApiParam(name = "sbimei", value = "设备IMEI", required = false)
@ApiParam(name = "sbimei", value = "设备IMEI")
@RequestParam(required = false) String sbimei,
@ApiParam(name = "bqdj", value = "病情等级", required = false)
@RequestParam(required = false) String bqdj){
@ApiParam(name = "bqdj", value = "病情等级")
@RequestParam(required = false) String bqdj,
@ApiParam(name = "sfzhm", value = "身份证号码")
@RequestParam(required = false) String sfzhm){
Page<Users> pageParam = new Page<>(page, limit);
QueryWrapper<Users> wrapper = new QueryWrapper<>();
......@@ -71,6 +73,9 @@ public class UsersController {
if(StringUtils.isNotBlank(bqdj)){
wrapper.eq("bq_dj", bqdj);
}
if(StringUtils.isNotBlank(sfzhm)){
wrapper.like("sfzhm", sfzhm);
}
wrapper.eq("xxsc_pdbz", "0");
wrapper.orderByAsc("djsj");
usersService.page(pageParam, wrapper);
......@@ -79,15 +84,22 @@ public class UsersController {
return MapRestResult.build(ResultCode.SUCCESS,"成功获取用户列表信息",total,records);
}
@ApiOperation(value = "根据设备IMEI查询用户信息")
@GetMapping("getUserBySbImei/{sbimei}")
@ApiOperation(value = "根据身份证号码查询用户信息")
@GetMapping("getUserBySfzhm/{sfzhm}")
public MapRestResult getById(
@ApiParam(name = "sbimei", value = "设备IMEI", required = true)
@PathVariable String sbimei){
@ApiParam(name = "sfzhm", value = "身份证号码", required = true)
@PathVariable String sfzhm){
UsersAndDevice usersAndDevice = new UsersAndDevice();
Users users = usersService.getById(sbimei);
usersAndDevice.setUsers(users);
usersAndDevice.setDevice(serverZdryApi.getDevice(sbimei));
QueryWrapper<Users> wrapper = new QueryWrapper<>();
wrapper.like("sfzhm", sfzhm);
wrapper.eq("xxsc_pdbz", "0");
Users users = usersService.getOne(wrapper);
if(null != users){
usersAndDevice.setUsers(users);
if(StringUtils.isNotEmpty(users.getSbImei())){
usersAndDevice.setDevice(serverZdryApi.getDevice(users.getSbImei()));
}
}
return MapRestResult.build(ResultCode.SUCCESS,"成功获取用户信息","1",usersAndDevice);
}
......@@ -95,50 +107,87 @@ public class UsersController {
@PostMapping("/saveUsers")
public MapRestResult saveUsers(@ApiParam(name = "UsersAndDevice", value = "用户对象", required = true)
@RequestBody UsersAndDevice usersAndDevice) {
// 调用开关接口
String result = serverZdryApi.updateDevice(usersAndDevice.getDevice());
if(result.equals("success")){
boolean flag = usersService.save(usersAndDevice.getUsers());
if(flag){
return MapRestResult.build(ResultCode.SUCCESS,"成功保存用户信息","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1");
}
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户开关信息失败",result);
try{
// 先查询是否有该用户 存在提示 该用户已存在 不存在插入
QueryWrapper<Users> wrapper = new QueryWrapper<>();
if(StringUtils.isNotBlank(usersAndDevice.getUsers().getSfzhm())){
wrapper.like("sfzhm", usersAndDevice.getUsers().getSfzhm());
wrapper.eq("xxsc_pdbz", "0");
Users users = usersService.getOne(wrapper);
if(null != users){
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","该用户已存在!");
}else{
boolean flag = usersService.save(usersAndDevice.getUsers());
if(flag){
if(StringUtils.isNotBlank(usersAndDevice.getDevice().getSbImei())) {
// 调用开关接口
String result = serverZdryApi.updateDevice(usersAndDevice.getDevice());
if(result.equals("success")) {
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户开关信息失败",result);
}
}else{
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1");
}
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1");
}
}
}else{
boolean flag = usersService.save(usersAndDevice.getUsers());
if(flag){
return MapRestResult.build(ResultCode.SUCCESS,"成功保存用户信息","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1");
}
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败",e.getMessage());
}
}
@ApiOperation(value = "根据设备IMEI修改用户信息")
@PostMapping("/updateUsersBySbImei")
@ApiOperation(value = "修改用户信息")
@PostMapping("/updateUsersBySfzhm")
public MapRestResult savePermission(@ApiParam(name = "UsersAndDevice", value = "用户对象", required = true)
@RequestBody UsersAndDevice usersAndDevice) {
// 调用开关接口
String result = serverZdryApi.updateDevice(usersAndDevice.getDevice());
if(result.equals("success")){
boolean flag = usersService.updateById(usersAndDevice.getUsers());
if(flag){
return MapRestResult.build(ResultCode.SUCCESS,"成功修改用户信息","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"修改用户开关信息失败","1");
}
}else{
return MapRestResult.build(ResultCode.ERROR,"修改用户信息失败",result);
}
try{
boolean flag = usersService.updateById(usersAndDevice.getUsers());
if(flag){
if(StringUtils.isNotBlank(usersAndDevice.getDevice().getSbImei())) {
// 调用开关接口
String result = serverZdryApi.updateDevice(usersAndDevice.getDevice());
if(result.equals("success")) {
return MapRestResult.build(ResultCode.SUCCESS, "成功修改用户信息", "1");
}else{
return MapRestResult.build(ResultCode.ERROR,"修改用户开关信息失败",result);
}
}else{
return MapRestResult.build(ResultCode.SUCCESS, "成功修改用户信息", "1");
}
}else {
return MapRestResult.build(ResultCode.ERROR, "修改用户信息失败", "1");
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"修改用户信息失败",e.getMessage());
}
}
@ApiOperation(value = "批量删除用户")
@PostMapping("/deleteUsersByIds")
public MapRestResult deleteUsersByIds(@RequestBody String[] sbimei) {
@PostMapping("/deleteUsersBySfzhms")
public MapRestResult deleteUsersByIds(@RequestBody String[] Sfzhms) {
QueryWrapper<Users> wrapper = new QueryWrapper<>();
boolean result = false;
for (String imei : sbimei) {
wrapper.eq("sb_imei",imei);
for (String sfzhm : Sfzhms) {
wrapper.eq("sfzhm",sfzhm);
// 查询
Users user = usersService.getOne(wrapper);
......
serviceapi/zdryapi/src/main/java/com/founder/zdryapi/controller/ZdryApiController.java
package com.founder.zdryapi.controller;
import com.founder.commonutils.ZdryApiEntity.Device;
import com.founder.commonutils.ZdryApiEntity.OnlineAndWear;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.zdryapi.service.ZdryApiService;
import io.swagger.annotations.Api;
......@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
/**
* <p>
......@@ -63,5 +65,24 @@ public class ZdryApiController {
) {
return zdryApiService.locationdata(deviceId,time_begin);
}
@ApiOperation(value = "批量获取设备离线在线状态数据")
@PostMapping(value = "/onlineAndWeardata")
public List<OnlineAndWear> onlineAndWeardata(@ApiParam(name = "online", value = "是否在线 1在线 0离线")
@RequestParam(required = false) String online,
@ApiParam(name = "wearFlag", value = "是否佩戴 1佩戴 0未佩戴")
@RequestParam(required = false) String wearFlag,
@ApiParam(name = "sbImei", value = "设备IMEI")
@RequestParam(required = false) String sbImei,
@ApiParam(name = "xm", value = "姓名")
@RequestParam(required = false) String xm,
@ApiParam(name = "current", value = "当前页", required = true)
@RequestParam int current,
@ApiParam(name = "pageNum", value = "每页多少条", required = true)
@RequestParam int pageNum
) {
return zdryApiService.onlineAndWeardata(online,wearFlag,sbImei,xm,current,pageNum);
}
}
serviceapi/zdryapi/src/main/java/com/founder/zdryapi/service/ZdryApiService.java
package com.founder.zdryapi.service;
import com.founder.commonutils.ZdryApiEntity.Device;
import com.founder.commonutils.ZdryApiEntity.OnlineAndWear;
import com.founder.commonutils.publicEntity.MapRestResult;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* <p>
......@@ -21,4 +26,5 @@ public interface ZdryApiService {
MapRestResult locationdata(String deviceId,String time_begin);
List<OnlineAndWear> onlineAndWeardata(String online, String wearFlag, String sbImei, String xm,int current,int pageNum);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment