Skip to content

M
map-parent
Commit 0fb39c74 by YANGYANG
Options

登录用户管理 和 不同单位不同用户 、任务等

parent df7b2efe
Showing with 558 additions and 24 deletions
common/common_utils/src/main/java/com/founder/commonutils/ZdryApiEntity/FenceTask.java
......@@ -74,4 +74,10 @@ public class FenceTask implements Serializable {
@ApiModelProperty(value = "1进入区域 2离开区域 3异常预警")
@TableField(value = "gklx")
private int gklx;
@ApiModelProperty(value = "信息登记单位公安机关机构代码")
private String xxdjdwGajgjgdm;
@ApiModelProperty(value = "信息登记单位公安机关机构名称")
private String xxdjdwGajgjgmc;
}
common/common_utils/src/main/java/com/founder/commonutils/constant/CommonCodeConstant.java 0 → 100644
package com.founder.commonutils.constant;
/**
* 通用变量
*/
public interface CommonCodeConstant {
String LOGIN_USER_KEY = "User";
}
common/common_utils/src/main/java/com/founder/commonutils/zdryEntity/DlUsers.java 0 → 100644
package com.founder.commonutils.zdryEntity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="gk_dluser对象", description="gk_dluser对象")
@TableName("gk_dluser")
public class DlUsers implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "信息主键编号自增长")
@TableId(type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "用户名")
private String username;
@ApiModelProperty(value = "密码BASE64")
private String password;
@ApiModelProperty(value = "姓名")
private String trueName;
@ApiModelProperty(value = "单位代码")
private String unitCode;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "登记时间")
@TableField(fill = FieldFill.INSERT)
private Date djsj;
@ApiModelProperty(value = "改写时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志 1删除 0未删除")
private Integer xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/zdryEntity/Users.java
......@@ -112,4 +112,10 @@ public class Users implements Serializable {
@ApiModelProperty(value = "1本人佩戴 0不是本人")
private Integer ismeWearFlag;
@ApiModelProperty(value = "信息登记单位公安机关机构代码")
private String xxdjdwGajgjgdm;
@ApiModelProperty(value = "信息登记单位公安机关机构名称")
private String xxdjdwGajgjgmc;
}
service/zdry/src/main/java/com/founder/zdry/controller/FenceTaskController.java
......@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.ZdryAndZdryApiVo.UsersAndOnlineAndTasksVo;
import com.founder.commonutils.ZdryApiEntity.FenceTask;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.ResultCode;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.zdry.fegin.ServerZdryApi;
import com.founder.zdry.service.FenceTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -15,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -34,6 +38,8 @@ public class FenceTaskController {
@Autowired
private FenceTaskService fenceTaskService;
@Autowired
private ServerZdryApi serverZdryApi;
@ApiOperation(value = "分页围栏任务列表")
@GetMapping("fenceTaskList/{page}/{limit}")
......@@ -51,11 +57,28 @@ public class FenceTaskController {
@RequestParam(required = false) String sbimei,
@ApiParam(name = "name", value = "任务名称")
@RequestParam(required = false) String name
@RequestParam(required = false) String name,
HttpServletRequest httpServletRequest
){
// 登陆者信息
DlUsers user=(DlUsers)httpServletRequest.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
Page<FenceTask> pageParam = new Page<>(page, limit);
QueryWrapper<FenceTask> wrapper = new QueryWrapper<>();
if(null != user){// 市局 分局 派出所
String code = "";
if(user.getUnitCode().endsWith("00000000")){
code = user.getUnitCode().substring(0,4);
}else if(user.getUnitCode().endsWith("000000")){
code = user.getUnitCode().substring(0,6);
}else if(user.getUnitCode().endsWith("0000")){
code = user.getUnitCode().substring(0,8);
}else{
code = user.getUnitCode();
}
wrapper.like("xxdjdw_gajgjgdm", code);
}
if(StringUtils.isNotBlank(gklx)){
wrapper.eq("gklx", gklx);
}
......@@ -95,9 +118,11 @@ public class FenceTaskController {
@RequestParam(required = false) String bqdj,
@ApiParam(name = "sfzhm", value = "身份证号码")
@RequestParam(required = false) String sfzhm
){
@RequestParam(required = false) String sfzhm,
HttpServletRequest httpServletRequest
){
DlUsers user=(DlUsers)httpServletRequest.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
Map map = new HashMap();
map.put("page",page * limit);
map.put("limit",limit);
......@@ -106,10 +131,45 @@ public class FenceTaskController {
map.put("bs",bs);
map.put("bqdj",bqdj);
map.put("sfzhm",sfzhm);
if(null != user){// 市局 分局 派出所
String code = "";
if(user.getUnitCode().endsWith("00000000")){
code = user.getUnitCode().substring(0,4);
}else if(user.getUnitCode().endsWith("000000")){
code = user.getUnitCode().substring(0,6);
}else if(user.getUnitCode().endsWith("0000")){
code = user.getUnitCode().substring(0,8);
}else{
code = user.getUnitCode();
}
map.put("xxdjdwGajgjgdm",code);
}
List<UsersAndOnlineAndTasksVo> list = fenceTaskService.fenceTaskPeopleList(map);
Integer total = fenceTaskService.fenceTaskPeopleListCount(map);
return MapRestResult.build(ResultCode.SUCCESS,"分页任务关联人列表",total,list);
}
@ApiOperation(value = "设置电子围栏")
@PostMapping(value = "/deviceFenceTask")
public MapRestResult deviceFenceTask(@ApiParam(name = "sbImei", value = "设备IMEI", required = true)
@RequestParam(value = "sbImei") String sbImei,
@ApiParam(name = "name", value = "电子围栏名称", required = true)
@RequestParam(value = "name") String name,
@ApiParam(name = "time_begin", value = "开始时间例早上八点:08:00", required = true)
@RequestParam(value = "time_begin") String time_begin,
@ApiParam(name = "time_end", value = "结束时间例下午六点:18:00", required = true)
@RequestParam(value = "time_end") String time_end,
@ApiParam(name = "safe_area", value = "A;B;C;D;A", required = true)
@RequestParam(value = "safe_area") String safe_area,
@ApiParam(name = "gklx", value = "1进入区域 2离开区域 3异常预警", required = true)
@RequestParam(value = "gklx") int gklx,
HttpServletRequest httpServletRequest
) {
// 登陆者信息
DlUsers user=(DlUsers)httpServletRequest.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
return serverZdryApi.deviceFenceTask(sbImei,name,time_begin,time_end,safe_area,gklx,user.getUnitCode(),user.getTrueName());
}
}
service/zdry/src/main/java/com/founder/zdry/controller/LoginController.java 0 → 100644
package com.founder.zdry.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.ResultCode;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.zdry.service.DlUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/login")
@Api(tags = "登陆管理")
public class LoginController {
@Autowired
private DlUserService userService;
@ApiOperation(value = "登陆")
@PostMapping("/loginDl")
@ResponseBody
public MapRestResult login(HttpServletRequest request,
@ApiParam(name = "username", value = "用户名", required = true)
@RequestParam String username,
@ApiParam(name = "password", value = "密码", required = true)
@RequestParam String password){
DlUsers user = new DlUsers();
user.setUsername(username);
user.setPassword(password);
if (user!=null) {
DlUsers loginUser = userService.login(user,request);
if (loginUser == null) {
return MapRestResult.error("用户名或密码错误!");
} else {
return MapRestResult.build(ResultCode.SUCCESS,"登陆成功!","1",loginUser);
}
}
return MapRestResult.error();
}
@ApiOperation(value = "注销")
@PostMapping("/loginOut")
@ResponseBody
public Map<String,Object> loginOut(HttpServletRequest request, HttpServletResponse response){
Map<String,Object> returnMap=new HashMap<>();
DlUsers user=null;
user=(DlUsers)request.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
if(user!=null){
request.getSession().removeAttribute(CommonCodeConstant.LOGIN_USER_KEY);
returnMap.put("state","success");
returnMap.put("msg","退出成功！");
}
return returnMap;
}
@ApiOperation(value = "分页登录用户列表")
@GetMapping("dlUserPageList/{page}/{limit}")
public MapRestResult dluserPageList(
@ApiParam(name = "page", value = "当前页码", required = true)
@PathVariable Long page,
@ApiParam(name = "limit", value = "每页记录数", required = true)
@PathVariable Long limit,
@ApiParam(name = "trueName", value = "姓名")
@RequestParam(required = false) String trueName,
@ApiParam(name = "unitCode", value = "单位代码")
@RequestParam(required = false) String unitCode){
Page<DlUsers> pageParam = new Page<>(page + 1, limit);
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
if(StringUtils.isNotBlank(trueName)){
wrapper.like("true_name", trueName);
}
if(StringUtils.isNotBlank(unitCode)){
wrapper.like("unit_code", unitCode);
}
wrapper.eq("xxsc_pdbz", "0");
wrapper.orderByAsc("djsj");
userService.page(pageParam, wrapper);
List<DlUsers> records = pageParam.getRecords();
records.stream().forEach(p->{
try {
p.setPassword( new String(Base64.getDecoder().decode(p.getPassword()), "UTF-8"));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
});
long total = pageParam.getTotal();
return MapRestResult.build(ResultCode.SUCCESS,"成功获取登录用户列表信息",total,records);
}
@ApiOperation(value = "新增登录用户")
@PostMapping("/dlSaveUsers")
public MapRestResult saveUsers(@ApiParam(name = "DlUsers", value = "用户对象", required = true)
@RequestBody DlUsers dlUsers) {
try{
// 先查询是否有该用户 存在提示 该用户已存在 不存在插入
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
// 密码base64加密
String password = Base64.getEncoder().encodeToString(dlUsers.getPassword().getBytes());
dlUsers.setPassword(password);
wrapper.eq("username", dlUsers.getUsername());
wrapper.eq("xxsc_pdbz", "0");
DlUsers users = userService.getOne(wrapper);
if(null != users){
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","该用户已存在!");
}else{
boolean flag = userService.save(dlUsers);
if(flag){
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","1");
}
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败",e.getMessage(),"1");
}
}
@ApiOperation(value = "根据id查询登录用户信息")
@GetMapping("getdlUserByUsername/{id}")
public MapRestResult getById(
@ApiParam(name = "id", value = "主键编号", required = true)
@PathVariable String id){
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
wrapper.eq("id", id);
wrapper.eq("xxsc_pdbz", "0");
DlUsers users = userService.getOne(wrapper);
if(null != users){
// 密码base64解密
String password = null;
try {
password = new String(Base64.getDecoder().decode(users.getPassword()), "UTF-8");
users.setPassword(password);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
return MapRestResult.build(ResultCode.SUCCESS,"成功获取用户信息","1",users);
}else{
return MapRestResult.build(ResultCode.ERROR,"获取用户信息失败","1","1");
}
}
@ApiOperation(value = "修改登录用户信息")
@PostMapping("/updateDlUsersById")
public MapRestResult savePermission(@ApiParam(name = "DlUsers", value = "用户对象", required = true)
@RequestBody DlUsers dlUsers) {
try{
if(StringUtils.isNotEmpty(dlUsers.getPassword())){
// 密码base64加密
String password = Base64.getEncoder().encodeToString(dlUsers.getPassword().getBytes());
dlUsers.setPassword(password);
}
boolean flag = userService.updateById(dlUsers);
if(flag){
return MapRestResult.build(ResultCode.SUCCESS, "成功修改用户信息", "1","1");
}else{
return MapRestResult.build(ResultCode.ERROR, "修改用户信息失败", "1","1");
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"修改用户信息失败",e.getMessage(),"1");
}
}
@ApiOperation(value = "批量删除登录用户")
@PostMapping("/deleteDlUsersByIds")
public MapRestResult deleteUsersByIds(@RequestBody String[] ids) {
int i = 0;
boolean result = false;
for (String id : ids) {
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
wrapper.eq("id",id);
// 查询
DlUsers user = userService.getOne(wrapper);
// 修改数据
user.setXxscPdbz(1);
// 执行更新
result = userService.updateById(user);
i++;
}
if(result){
return MapRestResult.build(ResultCode.SUCCESS,"成功删除用户信息","1",i);
}else{
return MapRestResult.build(ResultCode.ERROR,"删除用户信息失败","1","1");
}
}
}
service/zdry/src/main/java/com/founder/zdry/controller/UsersController.java
......@@ -4,8 +4,10 @@ package com.founder.zdry.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.ZdryAndZdryApiVo.UsersAndOnlineVo;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.ResultCode;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.commonutils.zdryEntity.Users;
import com.founder.commonutils.zdryEntity.UsersAndDevice;
import com.founder.zdry.fegin.ServerZdryApi;
......@@ -17,6 +19,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -59,11 +62,26 @@ public class UsersController {
@ApiParam(name = "bqdj", value = "病情等级")
@RequestParam(required = false) String bqdj,
@ApiParam(name = "sfzhm", value = "身份证号码")
@RequestParam(required = false) String sfzhm){
@RequestParam(required = false) String sfzhm,
HttpServletRequest httpServletRequest){
Page<Users> pageParam = new Page<>(page, limit);
// 登陆者信息
DlUsers user=(DlUsers)httpServletRequest.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
Page<Users> pageParam = new Page<>(page + 1, limit);
QueryWrapper<Users> wrapper = new QueryWrapper<>();
if(null != user){// 市局 分局 派出所
String code = "";
if(user.getUnitCode().endsWith("00000000")){
code = user.getUnitCode().substring(0,4);
}else if(user.getUnitCode().endsWith("000000")){
code = user.getUnitCode().substring(0,6);
}else if(user.getUnitCode().endsWith("0000")){
code = user.getUnitCode().substring(0,8);
}
wrapper.like("xxdjdw_gajgjgdm", code);
}
if(StringUtils.isNotBlank(xm)){
wrapper.like("xm", xm);
}
......@@ -109,16 +127,25 @@ public class UsersController {
@ApiOperation(value = "新增用户")
@PostMapping("/saveUsers")
public MapRestResult saveUsers(@ApiParam(name = "UsersAndDevice", value = "用户对象", required = true)
@RequestBody UsersAndDevice usersAndDevice) {
@RequestBody UsersAndDevice usersAndDevice, HttpServletRequest httpServletRequest) {
try{
// 先查询是否有该用户 存在提示 该用户已存在 不存在插入
// 登陆者信息
DlUsers user=(DlUsers)httpServletRequest.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
if(null != user){
usersAndDevice.getUsers().setXxdjdwGajgjgdm(user.getUnitCode());
usersAndDevice.getUsers().setXxdjdwGajgjgmc(user.getTrueName());
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","登陆超时请重新登录!");
}
// 先查询是否有该用户 存在提示 该用户已存在 不存在插入
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,"保存用户信息失败","该用户已存在!");
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","该用户已存在!");
}else{
boolean flag = usersService.save(usersAndDevice.getUsers());
if(flag){
......@@ -127,31 +154,31 @@ public class UsersController {
// 调用开关接口
String result = serverZdryApi.updateDevice(usersAndDevice.getDevice());
if(result.equals("success")) {
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1");
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户开关信息失败",result);
return MapRestResult.build(ResultCode.ERROR,"保存用户开关信息失败",result,"1");
}
}else{
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1");
return MapRestResult.build(ResultCode.SUCCESS, "成功保存用户信息", "1","1");
}
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1");
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","1");
}
}
}else{
boolean flag = usersService.save(usersAndDevice.getUsers());
if(flag){
return MapRestResult.build(ResultCode.SUCCESS,"成功保存用户信息","1");
return MapRestResult.build(ResultCode.SUCCESS,"成功保存用户信息","1","1");
}else{
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1");
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败","1","1");
}
}
}catch (Exception e){
e.printStackTrace();
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败",e.getMessage());
return MapRestResult.build(ResultCode.ERROR,"保存用户信息失败",e.getMessage(),"1");
}
}
......@@ -229,7 +256,9 @@ public class UsersController {
@RequestParam(required = false) String ismeWearFlag,
@ApiParam(name = "wearFlag", value = "1佩戴 0未佩戴")
@RequestParam(required = false) String wearFlag){
@RequestParam(required = false) String wearFlag,
HttpServletRequest httpServletRequest){
Map map = new HashMap();
map.put("page",page * limit);
map.put("limit",limit);
......@@ -238,6 +267,20 @@ public class UsersController {
map.put("online",online);
map.put("wearFlag",wearFlag);
map.put("ismeWearFlag",ismeWearFlag);
DlUsers user=(DlUsers)httpServletRequest.getSession().getAttribute(CommonCodeConstant.LOGIN_USER_KEY);
if(null != user){// 市局 分局 派出所
String code = "";
if(user.getUnitCode().endsWith("00000000")){
code = user.getUnitCode().substring(0,4);
}else if(user.getUnitCode().endsWith("000000")){
code = user.getUnitCode().substring(0,6);
}else if(user.getUnitCode().endsWith("0000")){
code = user.getUnitCode().substring(0,8);
}else{
code = user.getUnitCode();
}
map.put("xxdjdwGajgjgdm",code);
}
List<UsersAndOnlineVo> list = usersService.userPageOnlineList(map);
Integer total = usersService.userPageOnlineListCount(map);
return MapRestResult.build(ResultCode.SUCCESS,"成功获取用户列表信息",total,list);
......
service/zdry/src/main/java/com/founder/zdry/fegin/ServerZdryApi.java
package com.founder.zdry.fegin;
import com.founder.commonutils.ZdryApiEntity.Device;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.zdry.fegin.fallback.FallBackZdryApi;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
/**
* Created by yyon 2021/05/31
* 调用zdryapi子系统
......@@ -19,4 +23,16 @@ public interface ServerZdryApi {
@PostMapping("/zdryapi/updateDevice")
String updateDevice(@RequestBody Device deviceParam);
@PostMapping("/zdryapi/deviceFenceTask")
MapRestResult deviceFenceTask(
@RequestParam(value = "sbImei") String sbImei,
@RequestParam(value = "name") String name,
@RequestParam(value = "time_begin") String time_begin,
@RequestParam(value = "time_end") String time_end,
@RequestParam(value = "safe_area") String safe_area,
@RequestParam(value = "gklx") int gklx,
@RequestParam(value = "xxdjdw_gajgjgdm") String xxdjdw_gajgjgdm,
@RequestParam(value = "xxdjdw_gajgjgmc") String xxdjdw_gajgjgmc
);
}
service/zdry/src/main/java/com/founder/zdry/fegin/fallback/FallBackZdryApi.java
package com.founder.zdry.fegin.fallback;
import com.founder.commonutils.ZdryApiEntity.Device;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.zdry.fegin.ServerZdryApi;
import io.swagger.annotations.ApiParam;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
/**
* Created by yangyang on 2021/05/31
......@@ -22,4 +26,10 @@ public class FallBackZdryApi implements ServerZdryApi {
public String updateDevice(@RequestBody Device deviceParam) {
return "zdryapi服务器发生异常，断路器进行反馈";
}
@Override
public MapRestResult deviceFenceTask(String sbImei, String name, String time_begin, String time_end, String safe_area, int gklx, String xxdjdw_gajgjgdm,
String xxdjdw_gajgjgmc) {
return MapRestResult.build(201,"zdryapi服务器发生异常，断路器进行反馈","1","1");
}
}
\ No newline at end of file
service/zdry/src/main/java/com/founder/zdry/mapper/DlUserMapper.java 0 → 100644
package com.founder.zdry.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.zdryEntity.DlUsers;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* <p>
* 系统用户信息 Mapper 接口
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
@Mapper
@Component
public interface DlUserMapper extends BaseMapper<DlUsers> {
}
service/zdry/src/main/java/com/founder/zdry/mapper/xml/DlUserMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.zdry.mapper.DlUserMapper">
</mapper>
service/zdry/src/main/java/com/founder/zdry/mapper/xml/FenceTaskMapper.xml
......@@ -2,6 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.zdry.mapper.FenceTaskMapper">
<sql id="queryTlWhere">
<if test="xxdjdwGajgjgdm!= null and xxdjdwGajgjgdm!=''">
AND task.xxdjdw_gajgjgdm LIKE concat(#{xxdjdwGajgjgdm,jdbcType=VARCHAR}, '%')
</if>
<if test="xm!= null and xm!=''">
AND users.xm LIKE concat('%', #{xm,jdbcType=VARCHAR}, '%')
</if>
......
service/zdry/src/main/java/com/founder/zdry/mapper/xml/UsersMapper.xml
......@@ -2,6 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.zdry.mapper.UsersMapper">
<sql id="queryWhere">
<if test="xxdjdwGajgjgdm!= null and xxdjdwGajgjgdm!=''">
AND users.xxdjdw_gajgjgdm LIKE concat(#{xxdjdwGajgjgdm,jdbcType=VARCHAR}, '%')
</if>
<if test="xm!= null and xm!=''">
AND users.xm LIKE concat('%', #{xm,jdbcType=VARCHAR}, '%')
</if>
......
service/zdry/src/main/java/com/founder/zdry/service/DlUserService.java 0 → 100644
package com.founder.zdry.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.zdryEntity.DlUsers;
import javax.servlet.http.HttpServletRequest;
/**
* <p>
* 系统用户信息 服务类
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
public interface DlUserService extends IService<DlUsers> {
DlUsers login(DlUsers user, HttpServletRequest request);
}
service/zdry/src/main/java/com/founder/zdry/service/impl/DlUserServiceImpl.java 0 → 100644
package com.founder.zdry.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.zdry.mapper.DlUserMapper;
import com.founder.zdry.service.DlUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Base64;
/**
* <p>
* 系统用户信息 服务类
* </p>
*
* @author yangyang
* @since 2021-06-29
*/
@Service
public class DlUserServiceImpl extends ServiceImpl<DlUserMapper, DlUsers> implements DlUserService {
@Autowired
private DlUserMapper userMapper;
@Override
public DlUsers login(DlUsers user, HttpServletRequest request) {
//对password进行加密
QueryWrapper<DlUsers> wrapper = new QueryWrapper<>();
String password = Base64.getEncoder().encodeToString(user.getPassword().getBytes());
// 数据库字段名 对应值
wrapper.eq("USERNAME", user.getUsername());
wrapper.eq("PASSWORD", password);
wrapper.eq("XXSC_PDBZ", "0");
//设置需要查询的字段
wrapper.select("USERNAME", "UNIT_CODE","UNIT_NAME","TRUE_NAME");
user = userMapper.selectOne(wrapper);
if (user != null) {
request.getSession().setAttribute(CommonCodeConstant.LOGIN_USER_KEY, user);
}
return user;
}
}
service/zdry/src/main/resources/bootstrap.properties
#配置中心地址
spring.cloud.nacos.config.server-addr=47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr=47.92.48.137:8848
spring.cloud.nacos.config.server-addr=47.92.48.137:9949
spring.cloud.nacos.discovery.server-addr=47.92.48.137:9949
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
......
serviceapi/zdryapi/src/main/java/com/founder/zdryapi/controller/ZdryApiController.java
......@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
/**
......@@ -89,10 +90,14 @@ public class ZdryApiController {
@ApiParam(name = "safe_area", value = "A;B;C;D;A", required = true)
@RequestParam(value = "safe_area") String safe_area,
@ApiParam(name = "gklx", value = "1进入区域 2离开区域 3异常预警", required = true)
@RequestParam(value = "gklx") int gklx
@RequestParam(value = "gklx") int gklx,
@ApiParam(name = "xxdjdw_gajgjgdm", value = "信息登记单位公安机关机构代码", required = true)
@RequestParam(value = "xxdjdw_gajgjgdm") String xxdjdw_gajgjgdm,
@ApiParam(name = "xxdjdw_gajgjgmc", value = "信息登记单位公安机关名称", required = true)
@RequestParam(value = "xxdjdw_gajgjgmc") String xxdjdw_gajgjgmc
) {
return zdryApiService.deviceFenceTask(sbImei,name,time_begin,time_end,safe_area,gklx);
return zdryApiService.deviceFenceTask(sbImei,name,time_begin,time_end,safe_area,gklx,xxdjdw_gajgjgdm,xxdjdw_gajgjgmc);
}
@ApiOperation(value = "电子围栏预警")
......
serviceapi/zdryapi/src/main/java/com/founder/zdryapi/service/ZdryApiService.java
......@@ -3,6 +3,8 @@ package com.founder.zdryapi.service;
import com.founder.commonutils.ZdryApiEntity.Device;
import com.founder.commonutils.publicEntity.MapRestResult;
import javax.servlet.http.HttpServletRequest;
/**
* <p>
* 接口 服务类
......@@ -23,7 +25,7 @@ public interface ZdryApiService {
MapRestResult onlineAndWeardata();
MapRestResult deviceFenceTask(String sbImei,String name,String time_begin, String time_end, String safe_area,int gklx);
MapRestResult deviceFenceTask(String sbImei,String name,String time_begin, String time_end, String safe_area,int gklx, String xxdjdw_gajgjgdm,String xxdjdw_gajgjgmc);
MapRestResult FenceWarning();
......
serviceapi/zdryapi/src/main/java/com/founder/zdryapi/service/impl/ZdryApiServiceImpl.java
......@@ -5,8 +5,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.founder.commonutils.ZdryApiEntity.*;
import com.founder.commonutils.constant.CommonCodeConstant;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.ResultCode;
import com.founder.commonutils.zdryEntity.DlUsers;
import com.founder.commonutils.zdryEntity.Users;
import com.founder.zdryapi.mapper.*;
import com.founder.zdryapi.service.ZdryApiService;
......@@ -22,6 +24,7 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
......@@ -372,7 +375,9 @@ public class ZdryApiServiceImpl implements ZdryApiService {
}
@Override
public MapRestResult deviceFenceTask(String sbImei,String name, String time_begin, String time_end, String safe_area,int gklx) {
public MapRestResult deviceFenceTask(String sbImei,String name, String time_begin, String time_end, String safe_area,int gklx, String xxdjdw_gajgjgdm,String xxdjdw_gajgjgmc) {
SimpleDateFormat sf = new SimpleDateFormat("HH");
HttpHeaders headers = new HttpHeaders();
MediaType type = MediaType.parseMediaType("application/x-www-form-urlencoded");
......@@ -410,6 +415,8 @@ public class ZdryApiServiceImpl implements ZdryApiService {
fenceTask.setSbImei(sbImei);
fenceTask.setTaskType("dzwl");
fenceTask.setGklx(gklx);
fenceTask.setXxdjdwGajgjgdm(xxdjdw_gajgjgdm);
fenceTask.setXxdjdwGajgjgmc(xxdjdw_gajgjgmc);
// 执行更新
zdryFenceTaskMapper.updateById(fenceTask);
......@@ -422,6 +429,8 @@ public class ZdryApiServiceImpl implements ZdryApiService {
fenceTasks.setSbImei(sbImei);
fenceTasks.setTaskType("dzwl");
fenceTasks.setGklx(gklx);
fenceTasks.setXxdjdwGajgjgdm(xxdjdw_gajgjgdm);
fenceTasks.setXxdjdwGajgjgmc(xxdjdw_gajgjgmc);
// 插入数据
int flag = zdryFenceTaskMapper.insert(fenceTasks);
......@@ -450,6 +459,8 @@ public class ZdryApiServiceImpl implements ZdryApiService {
fenceTask.setSbImei(sbImei);
fenceTask.setTaskType("dzwl");
fenceTask.setGklx(gklx);
fenceTask.setXxdjdwGajgjgdm(xxdjdw_gajgjgdm);
fenceTask.setXxdjdwGajgjgmc(xxdjdw_gajgjgmc);
// 执行更新
zdryFenceTaskMapper.updateById(fenceTask);
......@@ -462,6 +473,8 @@ public class ZdryApiServiceImpl implements ZdryApiService {
fenceTasks.setSbImei(sbImei);
fenceTasks.setTaskType("dzwl");
fenceTasks.setGklx(gklx);
fenceTasks.setXxdjdwGajgjgdm(xxdjdw_gajgjgdm);
fenceTasks.setXxdjdwGajgjgmc(xxdjdw_gajgjgmc);
// 插入数据
int flag = zdryFenceTaskMapper.insert(fenceTasks);
......
serviceapi/zdryapi/src/main/resources/bootstrap.properties
#配置中心地址
spring.cloud.nacos.config.server-addr=47.92.48.137:8848
spring.cloud.nacos.discovery.server-addr=47.92.48.137:8848
spring.cloud.nacos.config.server-addr=47.92.48.137:9949
spring.cloud.nacos.discovery.server-addr=47.92.48.137:9949
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
......
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