Skip to content

X
xzxt-shiro
Commit 14b8e23e by liuyongshuai
Options

增加同步用户警综数据；修改所有的录入人和修改人信息

parent d8aab99b
Showing with 95 additions and 38 deletions
src/main/java/com/xzxtshiro/controller/admin/PermissionNewController.java
......@@ -93,7 +93,10 @@ public class PermissionNewController {
if (permission.getPid()==null){
permission.setPid("0");
}
permission.setLrr("admin");
SysUser user = TokenUtil.getUser();
permission.setLrr(user.getUsername());
permission.setLrdwdm(user.getUnitcode());
permission.setLrdwmc(user.getUnitname());
permission.setLrsj(new Date());
permission.setMenuname(permission.getName());
permission.setFlag(1);
......@@ -134,7 +137,8 @@ public class PermissionNewController {
*/
@RequestMapping(value = "/update", method = RequestMethod.POST)
public String update(SysPermissionNew permission, Model model) {
permission.setGxr("admin");
SysUser user = TokenUtil.getUser();
permission.setGxr(user.getUsername());
permission.setGxsj(new Date());
Integer update = permissionService.update(permission);
return "redirect:/admin/permission/index?msg=success";
......
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
......@@ -8,6 +8,7 @@ import com.xzxtshiro.util.Base64PasswordEncrypter;
import com.xzxtshiro.util.TokenUtil;
import com.xzxtshiro.util.ZtreeDataUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
......@@ -18,7 +19,11 @@ import javax.servlet.annotation.MultipartConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
......@@ -150,6 +155,17 @@ public class SysUserController {
model.addAttribute("msg", "用户名已存在,请修改用户名!");
return "admin/user/add";
} else {
//用户增加成功，同步警综信息
SysUser dlUser = TokenUtil.getUser();
String unit = dlUser.getUnitcode();
String unitFlag = "";
if(!"".equals(unit)&&unit!=null){
unitFlag=unit.substring(0,2);
}
if ("66".equals(unitFlag)||"51".equals(unitFlag)){
//同步警综用户
tbJZuserxx(user);
}
return "redirect:/admin/user/index?msg=success";
}
}
......@@ -320,4 +336,46 @@ public class SysUserController {
}
return res;
}
/**
* 同步警综用户信息
* @return
*/
public String tbJZuserxx(SysUser user){
String message="";
try{
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String birthday="";
if(null!=user.getBirthday()){
birthday=df.format(user.getBirthday());
}
String param="birthday="+birthday+"&sex="+user.getSex()+"&username="+user.getPolicemanid()+"&unitcode="+user.getUnitcode()+"&identitycard="+user.getIdentitycard()+"&telephone="+user.getTelephone()+"&password="+user.getPassword()+"&openFlag="+user.getOpenFlag()+"&policemanid="+user.getPolicemanid()+"&truename="+URLEncoder.encode(user.getTrueName(), "UTF-8");
String url="http://manage.asj.bt:9017/jwzh-manage/userInfoSync/doSync?"+param;
System.out.println("param::::::::::::::::::::"+param);
System.out.println("url::::::::::::::::::::"+url);
URI uri = new URI(url.toString());
URL url1 = uri.toURL();
URLConnection connection = url1.openConnection();
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
connection.setRequestProperty("Charset", "utf-8");
SysUser loginuser = TokenUtil.getUser();
connection.setRequestProperty("cookie","token=251120180119;userId="+loginuser.getPolicemanid());
connection.connect();
StringBuffer jsonStr = new StringBuffer();
//读取URL的响应
BufferedReader in = new BufferedReader(new InputStreamReader(
connection.getInputStream(), "UTF-8"));
String line;
while ((line = in.readLine()) != null) {
jsonStr.append(line);
}
System.out.println("esbServiceReturn.............................:"+jsonStr);
String esbServiceReturn = jsonStr.toString();
JSONObject jsonObject= JSONObject.fromObject(esbServiceReturn);
message=jsonObject.get("message").toString();
}catch(Exception e){
e.printStackTrace();
}
return message;
}
}
src/main/java/com/xzxtshiro/service/SysRoleService.java
......@@ -14,11 +14,6 @@ import java.util.Map;
* Created by liuys on 2018/6/26 0026.
*/
public interface SysRoleService {
/**
* 获取角色列表
* @return
*/
List<SysRole> selectSysRoles();
/**
* 根据条件获取所有角色，考虑后期需要根据一定的条件查询相关角色
......
src/main/java/com/xzxtshiro/service/imp/SysRoleServiceImpl.java
package com.xzxtshiro.service.imp;
import com.shiro.demo.pojo.User;
import com.shiro.demo.util.TokenUtil;
import com.xzxtshiro.dao.SysRoleDao;
import com.xzxtshiro.pojo.BaseModel;
import com.xzxtshiro.pojo.SysPermissionNew;
import com.xzxtshiro.pojo.SysRole;
import com.xzxtshiro.pojo.SysRolePermission;
import com.xzxtshiro.pojo.*;
import com.xzxtshiro.service.SysRoleService;
import com.xzxtshiro.util.SequenceUtil;
import com.xzxtshiro.util.TokenUtil;
import net.sf.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -25,21 +21,6 @@ public class SysRoleServiceImpl implements SysRoleService{
@Autowired
SysRoleDao sysRoleDao;
@Override
public List<SysRole> selectSysRoles() {
User user = TokenUtil.getUser();
SysRole role=sysRoleDao.selectSysRoleByUserId(user.getUserId());
List<SysRole> roles = sysRoleDao.selectSysRoles(role);
if (!role.getId().equals("e491fa549499c8015494d47b220010")){
for (int i = 0; i < roles.size(); i++) {
if (roles.get(i).getId().equals("e491fa549499c8015494d47b220010")){
roles.remove(i);
i--;
}
}
}
return roles;
}
@Override
public JSONArray selectSysRolesByCondition(SysRole sysRole) {
......@@ -71,9 +52,12 @@ public class SysRoleServiceImpl implements SysRoleService{
@Override
public SysRole add(SysRole sysRole) {
String roleZj = SequenceUtil.getNextXxzjbh();
SysUser user= TokenUtil.getUser();
sysRole.setScbz(0);
sysRole.setId(roleZj);
sysRole.setLrr("admin");
sysRole.setLrr(user.getUsername());
sysRole.setLrdwdm(user.getUnitcode());
sysRole.setLrdwmc(user.getUnitname());
sysRole.setLrsj(new Date());
//添加角色,并返回主键
Integer count = sysRoleDao.add(sysRole);
......@@ -87,7 +71,9 @@ public class SysRoleServiceImpl implements SysRoleService{
sysRolePermission.setId(SequenceUtil.getNextXxzjbh().substring(0,23));
sysRolePermission.setRoleid(roleZj);
sysRolePermission.setPermissionid(permissions[i]);
sysRolePermission.setLrr("admin");
sysRolePermission.setLrr(user.getUsername());
sysRolePermission.setLrdwdm(user.getUnitcode());
sysRolePermission.setLrdwmc(user.getUnitname());
sysRolePermission.setLrsj(new Date());
sysRolePermission.setScbz(0);
roleAndPermissions.add(sysRolePermission);
......@@ -116,8 +102,9 @@ public class SysRoleServiceImpl implements SysRoleService{
@Override
public SysRole update(SysRole sysRole) {
SysUser user = TokenUtil.getUser();
//修改角色
sysRole.setGxr("admin");
sysRole.setGxr(user.getUsername());
sysRole.setGxsj(new Date());
int a=sysRoleDao.update(sysRole);
//删除角色授权
......@@ -131,7 +118,9 @@ public class SysRoleServiceImpl implements SysRoleService{
sysRolePermission.setId(SequenceUtil.getNextXxzjbh().substring(0,23));
sysRolePermission.setRoleid(sysRole.getId());
sysRolePermission.setPermissionid(permissions[j]);
sysRolePermission.setLrr("admin");
sysRolePermission.setLrr(user.getUsername());
sysRolePermission.setLrdwdm(user.getUnitcode());
sysRolePermission.setLrdwmc(user.getUnitname());
sysRolePermission.setLrsj(new Date());
sysRolePermission.setScbz(0);
roleAndPermissions.add(sysRolePermission);
......
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
......@@ -116,6 +116,7 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public SysUser add(SysUser user) {
SysUser dlUser = TokenUtil.getUser();
if (user.getPassword() == null||user.getPassword()=="") {
user.setPassword("000000");
}
......@@ -129,10 +130,13 @@ public class SysUserServiceImpl implements SysUserService {
if (u == null) {
String userId = SequenceUtil.getNextXxzjbh();
user.setId(userId);
user.setLrr(dlUser.getUsername());
user.setLrdwdm(dlUser.getUnitcode());
user.setLrdwmc(dlUser.getUnitname());
user.setLrsj(new Date());
user.setScbz(0);
user.setDefaultDesktop(0);
user.setLrr("admin");
int i = userDao.insert(user);
if("1".equals(user.getHasZp())){
//有照片
......@@ -147,7 +151,9 @@ public class SysUserServiceImpl implements SysUserService {
sysUserRole.setId(SequenceUtil.getNextXxzjbh());
sysUserRole.setUserId(userId);
sysUserRole.setRoleId(role);
sysUserRole.setLrr("admin");
sysUserRole.setLrr(dlUser.getUsername());
sysUserRole.setLrdwdm(dlUser.getUnitcode());
sysUserRole.setLrdwmc(dlUser.getUnitname());
sysUserRole.setLrsj(new Date());
sysUserRole.setScbz(0);
userRoles.add(sysUserRole);
......@@ -189,7 +195,8 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public SysUser update(SysUser user) {
//1.首先修改用户的基本信息
user.setGxr("admin");
SysUser dlUser = TokenUtil.getUser();
user.setGxr(dlUser.getUsername());
user.setGxsj(new Date());
user.setPassword(new Base64PasswordEncrypter().encryptPassword(user.getPassword()));
int a = userDao.updateSysUserById(user);
......@@ -211,7 +218,9 @@ public class SysUserServiceImpl implements SysUserService {
sysUserRole.setId(SequenceUtil.getNextXxzjbh());
sysUserRole.setUserId(user.getId());
sysUserRole.setRoleId(role);
sysUserRole.setLrr("admin");
sysUserRole.setLrr(dlUser.getUsername());
sysUserRole.setLrdwdm(dlUser.getUnitcode());
sysUserRole.setLrdwmc(dlUser.getUnitname());
sysUserRole.setLrsj(new Date());
sysUserRole.setScbz(0);
userRoles.add(sysUserRole);
......@@ -224,9 +233,10 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public Integer deleteUserById(SysUser user) {
SysUser dlUser = TokenUtil.getUser();
//1.删除用户，此处即将scbz改为1
user.setGxsj(new Date());
user.setGxr("admin");
user.setGxr(dlUser.getUsername());
user.setScbz(1);
int a = userDao.updateSysUserById(user);
//2.删除用户和角色的绑定关系
......@@ -245,7 +255,8 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public Integer updatePwd(SysUser user) {
user.setGxr("admin");
SysUser dlUser = TokenUtil.getUser();
user.setGxr(dlUser.getUsername());
user.setGxsj(new Date());
user.setPassword(new Base64PasswordEncrypter().encryptPassword(user.getPassword()));
int a = userDao.updateSysUserById(user);
......
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