wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

绑定人员定位卡号

pull/4/head
dearlin 2024-01-25 14:20:05 +08:00
parent 0650dffac0
commit 8187112f9a
21 changed files with 4808 additions and 3746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java
View File

@ -1,5 +1,6 @@
package com.zcloud.controller.risk; package com.zcloud.controller.risk;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -13,11 +14,16 @@ import com.zcloud.util.*;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@ -58,7 +64,12 @@ public class IdentificationPartsController extends BaseController {
private Smb smb; private Smb smb;
@Autowired @Autowired
private UsersService usersService; private UsersService usersService;
/**新增
@Autowired
private RestTemplate restTemplate;
/**
* 新增
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -117,7 +128,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**获取风险点下拉框选项 /**
* 获取风险点下拉框选项
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -137,7 +150,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**删除 /**
* 删除
*
* @param out * @param out
* @throws Exception * @throws Exception
*/ */
@ -164,7 +179,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -206,7 +223,42 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**列表 // /region/region/list
/**
* @Description: 电子围栏 来自人员定位系统
* @Author: dearLin
* @Date: 2024/1/25/025 9:02
* @Param: [com.zcloud.entity.Page] [page]
* @Return: java.lang.Object
*/
@RequestMapping(value = "/ryRegionList")
@ResponseBody
public Object ryRegionList(Page page) throws Exception {
ReturnMap returnMap = new ReturnMap();
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", PLSUtil.getToken());
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
PageData pageData = this.getPageData();
String KEYWORDS = (String) pageData.getOrDefault("KEYWORDS","");
ResponseEntity<JSONObject> exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/region/region/list?pageNum=" +
Integer.parseInt(pageData.getString("currentPage")) +
"&pageSize=" + Integer.parseInt(pageData.getString("showCount")) +
"&str=" + KEYWORDS + "&type=0", HttpMethod.GET, httpEntity, JSONObject.class);
JSONObject body = exchange.getBody();
if (body != null) {
List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
returnMap.put("varList",list);
page.setTotalPage(body.getIntValue("total"));
returnMap.put("page",page);
return returnMap;
}
return ReturnMap.error("查询失败");
}
/**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -260,7 +312,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -280,7 +334,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -309,7 +365,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -334,7 +392,9 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -485,7 +545,9 @@ public class IdentificationPartsController extends BaseController {
} }
/**导出到excel /**
* 导出到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -533,7 +595,9 @@ public class IdentificationPartsController extends BaseController {
// FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "identificationpartsExcelTemplate.xls", "identificationpartsExcelTemplate.xls"); // FileDownload.fileDownload(response, PathUtil.getProjectpath() + Const.FILEPATHFILE + "identificationpartsExcelTemplate.xls", "identificationpartsExcelTemplate.xls");
// } // }
/**从EXCEL导入到数据库 /**
* 从EXCEL导入到数据库
*
* @param file * @param file
* @return * @return
* @throws Exception * @throws Exception
@ -559,7 +623,9 @@ public class IdentificationPartsController extends BaseController {
try { try {
if (listPd.size() > 0) { if (listPd.size() > 0) {
List<String> header = new ArrayList<>(); List<String> header = new ArrayList<>();
header.add("所属部门");header.add("风险点（单元）");header.add("辨识部位"); header.add("所属部门");
header.add("风险点（单元）");
header.add("辨识部位");
PageData pdCorpId = new PageData(); PageData pdCorpId = new PageData();
pdCorpId.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pdCorpId.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pdCorpId.put("ISDELETE", "0"); pdCorpId.put("ISDELETE", "0");
@ -665,7 +731,9 @@ public class IdentificationPartsController extends BaseController {
} }
/**判断同一个风险点辨识部位名称是否重复 /**
* 判断同一个风险点辨识部位名称是否重复
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -692,8 +760,9 @@ public class IdentificationPartsController extends BaseController {
/** /**
* 去修改页面获取数据 * 去修改页面获取数据
* * <p>
* 风险管控->辨识部位->匹配资源存在风险 * 风险管控->辨识部位->匹配资源存在风险
*
* @param * @param
* @throws Exception * @throws Exception
*/ */

613
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -1,5 +1,6 @@
package com.zcloud.controller.system; package com.zcloud.controller.system;
import com.alibaba.fastjson.JSON;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.EmployeeData; import com.zcloud.entity.EmployeeData;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
@ -18,6 +19,7 @@ import net.sf.json.JSONArray;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.crypto.hash.SimpleHash; import org.apache.shiro.crypto.hash.SimpleHash;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -69,7 +71,10 @@ public class UsersController extends BaseController {
private DictionariesCorpService dictionariesCorpService; private DictionariesCorpService dictionariesCorpService;
@Autowired @Autowired
private ImgFilesService imgfilesService; private ImgFilesService imgfilesService;
/**用户列表
/**
* 用户列表
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -111,7 +116,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**用户列表(多选列表使用) /**
* 用户列表(多选列表使用)
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -147,7 +154,9 @@ public class UsersController extends BaseController {
} }
/**去新增用户页面 /**
* 去新增用户页面
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -205,7 +214,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**去修改用户页面(从系统用户页面修改) /**
* 去修改用户页面(从系统用户页面修改)
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -217,7 +228,9 @@ public class UsersController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if("1".equals(pd.getString("USER_ID"))){return null;} //不能修改admin用户 if ("1".equals(pd.getString("USER_ID"))) {
return null;
} //不能修改admin用户
pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL()); pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL());
List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色
pd.put("PARENT_ID", Jurisdiction.getVIPLEVEL()); pd.put("PARENT_ID", Jurisdiction.getVIPLEVEL());
@ -292,7 +305,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**去修改用户页面(个人资料修改) /**
* 去修改用户页面(个人资料修改)
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -378,8 +393,9 @@ public class UsersController extends BaseController {
public Object editUser() throws Exception { public Object editUser() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData();
if (pd.get("USERAVATARURL") != null && !pd.getString("USERAVATARURL").equals("")) { if (pd.get("USERAVATARURL") != null && !pd.getString("USERAVATARURL").equals("")) {
// System.out.println("USERAVATARURL原长度："+pd.getString("USERAVATARURL").length()); // System.out.println("USERAVATARURL原长度："+pd.getString("USERAVATARURL").length());
String USERAVATARURL64 = ImageAnd64Binary.zipBase64(pd.getString("USERAVATARURL")); String USERAVATARURL64 = ImageAnd64Binary.zipBase64(pd.getString("USERAVATARURL"));
@ -400,16 +416,20 @@ public class UsersController extends BaseController {
} }
FHLOG.save(Jurisdiction.getUsername(), "从系统用户中修改" + pd.getString("USERNAME") + "的资料"); //记录日志 FHLOG.save(Jurisdiction.getUsername(), "从系统用户中修改" + pd.getString("USERNAME") + "的资料"); //记录日志
if (!Jurisdiction.getUsername().equals(pd.getString("USERNAME"))) { //如果当前登录用户修改用户资料提交的用户名非本人 if (!Jurisdiction.getUsername().equals(pd.getString("USERNAME"))) { //如果当前登录用户修改用户资料提交的用户名非本人
if("admin".equals(pd.getString("USERNAME")) && !"admin".equals(Jurisdiction.getUsername())){return null;} //非admin用户不能修改admin if ("admin".equals(pd.getString("USERNAME")) && !"admin".equals(Jurisdiction.getUsername())) {
return null;
} //非admin用户不能修改admin
} else { //如果当前登录用户修改用户资料提交的用户名是本人，则不能修改本人的角色ID } else { //如果当前登录用户修改用户资料提交的用户名是本人，则不能修改本人的角色ID
PageData upd = new PageData(); PageData upd = usersService.findByUsername(pd);
upd = usersService.findByUsername(pd);
pd.put("ROLE_ID", upd.getString("ROLE_ID")); //对角色ID还原本人角色ID pd.put("ROLE_ID", upd.getString("ROLE_ID")); //对角色ID还原本人角色ID
pd.put("ROLE_IDS", Tools.notEmpty(upd.getString("ROLE_IDS")) ? upd.get("ROLE_IDS") : ""); //对角色ID还原本人副职角色ID pd.put("ROLE_IDS", Tools.notEmpty(upd.getString("ROLE_IDS")) ? upd.get("ROLE_IDS") : ""); //对角色ID还原本人副职角色ID
} }
if (pd.getString("PASSWORD") != null && !"".equals(pd.getString("PASSWORD"))) { if (pd.getString("PASSWORD") != null && !"".equals(pd.getString("PASSWORD"))) {
pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString()); pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString());
} }
String msg = usersService.changeOrUpdUserCardNo(pd);
if (msg.equals(Const.CAN_CHENG_USER)) {
if (PLSUtil.editUser(pd)) {
usersService.editUser(pd); //执行修改 usersService.editUser(pd); //执行修改
if ("true".equals(pd.getString("ISSTUDENT"))) { if ("true".equals(pd.getString("ISSTUDENT"))) {
if ("select".equals(pd.getString("letDutiesType"))) { if ("select".equals(pd.getString("letDutiesType"))) {
@ -445,7 +465,6 @@ public class UsersController extends BaseController {
userInfoService.delete(pd); userInfoService.delete(pd);
userInfoService.save(pd); userInfoService.save(pd);
} }
// 如果修改了部门/岗位，将该用户所有清单都删除 // 如果修改了部门/岗位，将该用户所有清单都删除
if (pd.get("OPERATIONTYPE") != null && pd.get("OPERATIONTYPE").toString() != null && Tools.notEmpty(pd.get("OPERATIONTYPE").toString())) { if (pd.get("OPERATIONTYPE") != null && pd.get("OPERATIONTYPE").toString() != null && Tools.notEmpty(pd.get("OPERATIONTYPE").toString())) {
List<PageData> listIds = listManagerService.listListByUser(pd); List<PageData> listIds = listManagerService.listListByUser(pd);
@ -550,8 +569,15 @@ public class UsersController extends BaseController {
} }
} }
} }
map.put("result", errInfo); map.put("result", errInfo);
} else {
map.put("result", "errInfo");
map.put("msg", "人员定位系统修改失败");
}
return map;
}
map.put("result", "errInfo");
map.put("msg", msg);
return map; return map;
} }
@ -601,7 +627,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**判断用户名是否存在 /**
* 判断用户名是否存在
*
* @return * @return
*/ */
@RequestMapping(value = "/hasUser") @RequestMapping(value = "/hasUser")
@ -620,7 +648,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**判断邮箱是否存在 /**
* 判断邮箱是否存在
*
* @return * @return
*/ */
@RequestMapping(value = "/hasEmail") @RequestMapping(value = "/hasEmail")
@ -637,7 +667,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**判断编码是否存在 /**
* 判断编码是否存在
*
* @return * @return
*/ */
@RequestMapping(value = "/hasNumber") @RequestMapping(value = "/hasNumber")
@ -654,7 +686,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**检验身份证号是否有效 /**
* 检验身份证号是否有效
*
* @return * @return
*/ */
@RequestMapping(value = "/validateIdentity") @RequestMapping(value = "/validateIdentity")
@ -670,7 +704,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**保存用户 /**
* 保存用户
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -761,7 +797,6 @@ public class UsersController extends BaseController {
// map.put("USER_ID", pd.getString("USER_ID")); //返回结果 // map.put("USER_ID", pd.getString("USER_ID")); //返回结果
// return map; // return map;
// } // }
@RequestMapping(value = "/saveUser") @RequestMapping(value = "/saveUser")
@RequiresPermissions("user:add") @RequiresPermissions("user:add")
@ResponseBody @ResponseBody
@ -777,13 +812,16 @@ public class UsersController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
errInfo = "error"; errInfo = "error";
map.put("msg", e.getMessage()); map.put("msg", e.getMessage());
throw e;
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("USER_ID", pd.getString("USER_ID")); map.put("USER_ID", pd.getString("USER_ID"));
return map; return map;
} }
/**删除用户 /**
* 删除用户
*
* @return * @return
*/ */
@RequestMapping(value = "/deleteUser") @RequestMapping(value = "/deleteUser")
@ -796,6 +834,11 @@ public class UsersController extends BaseController {
String errInfo = "success"; String errInfo = "success";
pd = this.getPageData(); pd = this.getPageData();
FHLOG.save(Jurisdiction.getUsername(), "删除用户ID：" + pd.getString("USER_ID")); //记录日志 FHLOG.save(Jurisdiction.getUsername(), "删除用户ID：" + pd.getString("USER_ID")); //记录日志
if (!PLSUtil.removeUser(pd)) {
map.put("result", "errInfo"); //返回结果
map.put("msg", "删除失败，请联系管理员"); //返回结果
return map;
}
usersService.deleteUser(pd); //删除用户 usersService.deleteUser(pd); //删除用户
ueditorService.delete(pd); //删除副文本关联数据 ueditorService.delete(pd); //删除副文本关联数据
@ -923,6 +966,7 @@ public class UsersController extends BaseController {
/** /**
* 批量删除 * 批量删除
*
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/deleteAllUser") @RequestMapping(value = "/deleteAllUser")
@ -947,7 +991,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**导出用户信息到EXCEL /**
* 导出用户信息到EXCEL
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -1001,7 +1047,9 @@ public class UsersController extends BaseController {
} }
/**从EXCEL导入到数据库 /**
* 从EXCEL导入到数据库
*
* @param file * @param file
* @return * @return
* @throws Exception * @throws Exception
@ -1065,7 +1113,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**去修改用户页面(在线管理页面打开) /**
* 去修改用户页面(在线管理页面打开)
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -1076,7 +1126,9 @@ public class UsersController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
if("admin".equals(pd.getString("USERNAME"))){return null;} //不能查看admin用户 if ("admin".equals(pd.getString("USERNAME"))) {
return null;
} //不能查看admin用户
pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL()); pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL());
List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色
map.put("fx", "user"); map.put("fx", "user");
@ -1101,7 +1153,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**查看用户 /**
* 查看用户
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -1113,7 +1167,9 @@ public class UsersController extends BaseController {
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String USERNAME = pd.getString("USERNAME"); String USERNAME = pd.getString("USERNAME");
if("admin".equals(USERNAME)){return null;} //不能查看admin用户 if ("admin".equals(USERNAME)) {
return null;
} //不能查看admin用户
pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL()); pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL());
List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色 List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色
pd = usersService.findByUsername(pd); //根据ID读取 pd = usersService.findByUsername(pd); //根据ID读取
@ -1131,7 +1187,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**显示用户列表(弹窗选择用) /**
* 显示用户列表(弹窗选择用)
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -1161,7 +1219,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**列表 /**
* 列表
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -1179,7 +1239,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**列表 /**
* 列表
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@ -1205,7 +1267,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**从EXCEL导入到数据库 /**
* 从EXCEL导入到数据库
*
* @param file * @param file
* @return * @return
* @throws Exception * @throws Exception
@ -1231,34 +1295,44 @@ public class UsersController extends BaseController {
* var2 :用户名 * var2 :用户名
* var3 :姓名 * var3 :姓名
* var4 :邮箱 * var4 :邮箱
* var5 :备注 * var5 :人员定位卡号(4位纯数字)
* var6 :备注
*/ */
List<String> header = new ArrayList<String>(); List<String> header = new ArrayList<String>();
header.add("部门");header.add("岗位");header.add("用户名");header.add("姓名");header.add("邮箱");header.add("备注");header.add("是否在线学习人员"); header.add("部门");
List<String> headerByLearningStatus = new ArrayList<String>(); header.add("岗位");
headerByLearningStatus.add("身份证号");headerByLearningStatus.add("民族");headerByLearningStatus.add("性别"); header.add("用户名");
headerByLearningStatus.add("政治面貌");headerByLearningStatus.add("出生年学");headerByLearningStatus.add("文化程度"); header.add("姓名");
headerByLearningStatus.add("人员类型");headerByLearningStatus.add("职务");headerByLearningStatus.add("职称"); header.add("邮箱");
headerByLearningStatus.add("工种");headerByLearningStatus.add("入职日期");headerByLearningStatus.add("参加工种日期"); header.add("人员定位卡号");
headerByLearningStatus.add("在职情况"); header.add("备注");
// header.add("是否在线学习人员");
// List<String> headerByLearningStatus = new ArrayList<String>();
// headerByLearningStatus.add("身份证号");headerByLearningStatus.add("民族");headerByLearningStatus.add("性别");
// headerByLearningStatus.add("政治面貌");headerByLearningStatus.add("出生年学");headerByLearningStatus.add("文化程度");
// headerByLearningStatus.add("人员类型");headerByLearningStatus.add("职务");headerByLearningStatus.add("职称");
// headerByLearningStatus.add("工种");headerByLearningStatus.add("入职日期");headerByLearningStatus.add("参加工种日期");
// headerByLearningStatus.add("在职情况");
try { try {
if (listPd.size() > 0) { if (listPd.size() > 0) {
Set<String> cardNoMap = new HashSet<String>();
/** 获取企业下的所有部门信息*/ /** 获取企业下的所有部门信息*/
PageData departPd = new PageData(); PageData departPd = new PageData();
departPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); departPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> userInfoMap = usersService.getUserCardNoAll(departPd);
HashMap<String, String> userInfos = new HashMap<>();
for (PageData pageData : userInfoMap) {
userInfos.put(pageData.getString("CARDNO"), pageData.getString("USERNAME"));
}
List<PageData> departList = departmentService.listAll(departPd); List<PageData> departList = departmentService.listAll(departPd);
Map<String, Object> departMap = new HashMap<String, Object>(); Map<String, Object> departMap = new HashMap<String, Object>();
for (PageData pageData : departList) { for (PageData pageData : departList) {
departMap.put(Tools.excelHandle(pageData.getString("NAME")), pageData); departMap.put(Tools.excelHandle(pageData.getString("NAME")), pageData);
} }
/* Map<String,Object> departNameMap = new HashMap<>();/
for (PageData pageData : departList) {
String nameKey = getParentName(pageData.getString("DEPARTMENT_ID"),departMap);
departNameMap.put(nameKey,pageData.getString("DEPARTMENT_ID"));
}*/
/** 获取所有岗位信息 */ /** 获取所有岗位信息 */
PageData postPd = new PageData(); PageData postPd = new PageData();
postPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); postPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
@ -1280,10 +1354,10 @@ public class UsersController extends BaseController {
userPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); userPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> userList = usersService.findUserNameAll(userPd); List<PageData> userList = usersService.findUserNameAll(userPd);
List<PageData> userEList = usersService.findAllUser(userPd); List<PageData> userEList = usersService.findAllUser(userPd);
Map<String, Object> userMap = new HashMap<>(); Map<String, String> userMap = new HashMap<>();
Map<String, Object> emailMap = new HashMap<>(); Map<String, Object> emailMap = new HashMap<>();
for (PageData pageData : userList) { for (PageData pageData : userList) {
userMap.put(pageData.getString("USERNAME"), ""); userMap.put(pageData.getString("USERNAME"), JSON.toJSONString(pageData));
} }
for (PageData pageData : userEList) { for (PageData pageData : userEList) {
emailMap.put(pageData.getString("USERNAME"), ""); emailMap.put(pageData.getString("USERNAME"), "");
@ -1312,19 +1386,15 @@ public class UsersController extends BaseController {
Map<String, Object> emailChongfu = new HashMap<>();//判断重复数据 Map<String, Object> emailChongfu = new HashMap<>();//判断重复数据
Integer number = 0;//行数，用于提示用户 Integer number = 0;//行数，用于提示用户
List<PageData> addUserList = new ArrayList<>(); List<PageData> addUserList = new ArrayList<>();
List<PageData> editUserList = new ArrayList<>();
for (PageData lpd : listPd) { for (PageData lpd : listPd) {
number++; number++;
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
if(i>=4) { if (i == 1 || i == 6) {
continue;
}
if(!lpd.containsKey("var"+i)) {
errorStr.append("第"+number+"行的\""+header.get(i)+"\"无数据;\n");
continue; continue;
} }
if (Tools.isEmpty(lpd.get("var" + i))) { if (Tools.isEmpty(lpd.get("var" + i))) {
errorStr.append("第" + number + "行的\"" + header.get(i) + "\"无数据;\n"); errorStr.append("第" + number + "行的\"" + header.get(i) + "\"无数据;\n");
continue;
} }
} }
@ -1333,20 +1403,16 @@ public class UsersController extends BaseController {
String userName = Tools.isEmpty(lpd.get("var2")) ? "" : lpd.get("var2").toString();//用户名 String userName = Tools.isEmpty(lpd.get("var2")) ? "" : lpd.get("var2").toString();//用户名
String name = Tools.isEmpty(lpd.get("var3")) ? "" : lpd.get("var3").toString();//姓名 String name = Tools.isEmpty(lpd.get("var3")) ? "" : lpd.get("var3").toString();//姓名
String eMail = Tools.isEmpty(lpd.get("var4")) ? "" : lpd.get("var4").toString();//邮箱 String eMail = Tools.isEmpty(lpd.get("var4")) ? "" : lpd.get("var4").toString();//邮箱
String bz = Tools.isEmpty(lpd.get("var5"))?"":lpd.get("var5").toString();//备注 String CardNo = Tools.isEmpty(lpd.get("var5")) ? "" : lpd.get("var5").toString();//人员定位卡号
/* String bz = Tools.isEmpty(lpd.get("var6")) ? "" : lpd.get("var6").toString();//备注
if(Tools.isEmpty(dept) || Tools.isEmpty(postName) || Tools.isEmpty(userName) ||Tools.isEmpty(name) ) {
errInfo = "error";
errorStr.append("第"+number+"行,公司级部门,岗位,用户名,姓名为信息必填项,请重新确认数据");
break;
}
*/
/* if(!departMap.containsKey(dept)) {
errorStr.append("第"+number+"行的"+header.get(0)+"未找到名称为\""+dept+"\"的部门"+";\n");
continue;
}*/
Pattern patternPhone = Pattern.compile(RegexPatterns.PHONE_REGEX); Pattern patternPhone = Pattern.compile(RegexPatterns.PHONE_REGEX);
Pattern patternRardNo = Pattern.compile(RegexPatterns.VERIFY_CARDNO_REGEX);
Matcher matcher = patternPhone.matcher(lpd.getString("var2")); Matcher matcher = patternPhone.matcher(lpd.getString("var2"));
Matcher matcherRardNo = patternRardNo.matcher(lpd.getString("var5"));
if (!matcherRardNo.matches()) {
errorStr.append("第" + number + "行,");
errorStr.append("定位卡号" + CardNo + "格式不正确,请重新确认数据;\n");
}
if (!matcher.matches()) { if (!matcher.matches()) {
errorStr.append("第" + number + "行,"); errorStr.append("第" + number + "行,");
errorStr.append("手机号格式不正确,请重新确认数据;\n"); errorStr.append("手机号格式不正确,请重新确认数据;\n");
@ -1363,48 +1429,24 @@ public class UsersController extends BaseController {
} }
/** 部门信息 结束**/ /** 部门信息 结束**/
/** 岗位 **/ /** 岗位 **/
/* if(Tools.isEmpty(postName)) {
errInfo = "error";
errorStr.append("第"+number+"行,岗位信息为空,请重新确认数据");
break;
}*/
if(!postMap.containsKey(departId)) {
errorStr.append("第"+number+"行,未找到该部门的岗位信息,请重新确认数据;\n");
continue;
}
Map<String, Object> postValMap = postMap.get(departId);//这个部门下的所有岗位信息 Map<String, Object> postValMap = postMap.get(departId);//这个部门下的所有岗位信息
if(!postValMap.containsKey(postName)) { String postId = "";
errorStr.append("第"+number+"行,在"+dept+"部门下，未找到"+postName+"岗位信息,请重新确认数据;\n"); if (postValMap != null) {
continue; PageData o = (PageData) postValMap.get(postName);
postId = o.getString("POST_ID");
} }
PageData post = (PageData) postValMap.get(postName);
String postId = post.getString("POST_ID");
/*for (PageData pageData : postValList) {
if(postName.equals(pageData.getString("NAME"))) {
postId = pageData.getString("POST_ID");
}
}*/
/* if(Tools.isEmpty(postId)) {
errInfo = "error";
errorStr.append("第"+number+"行,");
errorStr.append("在"+keyDept+"部门下，未找到"+postName+"岗位信息,请重新确认数据");
break;
}*/
/** 岗位 结束**/ /** 岗位 结束**/
if(userMap.containsKey(userName)) {
System.out.println(userMap.containsKey(userName));
errorStr.append("第"+number+"行,");
errorStr.append("用户名“"+userName+"”已经存在，请勿重复导入;\n");
continue;
}
if (hasUserNameChongfu.containsKey(userName)) { if (hasUserNameChongfu.containsKey(userName)) {
errorStr.append("第" + number + "行,"); errorStr.append("第" + number + "行,");
errorStr.append("用户名重复,请重新确认数据;\n"); errorStr.append("用户名重复,请重新确认数据;\n");
continue; continue;
} }
if (!cardNoMap.add(CardNo)) {
errorStr.append("第" + number + "行,");
errorStr.append("定位卡号" + CardNo + "excel中重复,请重新确认数据;\n");
continue;
}
if (emailMap.containsKey(eMail)) { if (emailMap.containsKey(eMail)) {
errorStr.append("第" + number + "行,"); errorStr.append("第" + number + "行,");
@ -1431,6 +1473,7 @@ public class UsersController extends BaseController {
user.put("USERNAME", userName); user.put("USERNAME", userName);
user.put("PASSWORD", new SimpleHash("SHA-1", userName, "666666").toString()); user.put("PASSWORD", new SimpleHash("SHA-1", userName, "666666").toString());
user.put("NAME", name); user.put("NAME", name);
user.put("CARDNO", CardNo);
user.put("ROLE_ID", role.getString("ROLE_ID")); user.put("ROLE_ID", role.getString("ROLE_ID"));
user.put("LAST_LOGIN", ""); user.put("LAST_LOGIN", "");
user.put("IP", ""); user.put("IP", "");
@ -1447,157 +1490,207 @@ public class UsersController extends BaseController {
user.put("FUN_IDS", ""); user.put("FUN_IDS", "");
user.put("RIGHTS", "788664966448"); user.put("RIGHTS", "788664966448");
user.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); user.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
user.put("zxxxType", "0");// 在线学习情况 user.put("ISSTUDENT", "0");// 在线学习情况
user.put("DURATION", "-1");// 工作状态持 user.put("DURATION", "-1");// 工作状态持
String zxxxType = Tools.isEmpty(lpd.get("var6"))?"":lpd.get("var6").toString();//是否在线学习人员 // String zxxxType = Tools.isEmpty(lpd.get("var6")) ? "" : lpd.get("var6").toString();//是否在线学习人员
if("是".equals(zxxxType)){ // 在线学习情况 // if ("是".equals(zxxxType)) { // 在线学习情况
user.put("zxxxType", "1");// 在线学习情况 // user.put("zxxxType", "1");// 在线学习情况
for(int i=8;i<19;i++) { // for (int i = 8; i < 19; i++) {
if(i== 13) // 人员类型 非必填 // if (i == 13) // 人员类型 非必填
if(!lpd.containsKey("var"+i)) { // if (!lpd.containsKey("var" + i)) {
errorStr.append("第"+number+"行的\""+headerByLearningStatus.get(i)+"\"无数据;\n"); // errorStr.append("第" + number + "行的\"" + headerByLearningStatus.get(i) + "\"无数据;\n");
continue; // continue;
} // }
if(Tools.isEmpty(lpd.get("var"+i))) { // if (Tools.isEmpty(lpd.get("var" + i))) {
errorStr.append("第"+number+"行的\""+headerByLearningStatus.get(i)+"\"无数据;\n"); // errorStr.append("第" + number + "行的\"" + headerByLearningStatus.get(i) + "\"无数据;\n");
continue; // continue;
} // }
} // }
String USER_ID_CARD = Tools.isEmpty(lpd.get("var7"))?"":lpd.get("var7").toString();//身份证号 // String USER_ID_CARD = Tools.isEmpty(lpd.get("var7")) ? "" : lpd.get("var7").toString();//身份证号
String NATION = Tools.isEmpty(lpd.get("var8"))?"":lpd.get("var8").toString();//民族 // String NATION = Tools.isEmpty(lpd.get("var8")) ? "" : lpd.get("var8").toString();//民族
String SEX = Tools.isEmpty(lpd.get("var9"))?"":lpd.get("var9").toString();//性别 // String SEX = Tools.isEmpty(lpd.get("var9")) ? "" : lpd.get("var9").toString();//性别
//
String POLITICAL_OUTLOOK = Tools.isEmpty(lpd.get("var10"))?"":lpd.get("var10").toString();//政治面貌 // String POLITICAL_OUTLOOK = Tools.isEmpty(lpd.get("var10")) ? "" : lpd.get("var10").toString();//政治面貌
String DATE_OF_BIRTH = Tools.isEmpty(lpd.get("var11"))?"":lpd.get("var11").toString();//出生年学 // String DATE_OF_BIRTH = Tools.isEmpty(lpd.get("var11")) ? "" : lpd.get("var11").toString();//出生年学
String DEGREE_OF_EDUCATION = Tools.isEmpty(lpd.get("var12"))?"":lpd.get("var12").toString();//文化程度 // String DEGREE_OF_EDUCATION = Tools.isEmpty(lpd.get("var12")) ? "" : lpd.get("var12").toString();//文化程度
//
String PERSONNEL_TYPE = Tools.isEmpty(lpd.get("var13"))?"":lpd.get("var13").toString();//人员类型 // String PERSONNEL_TYPE = Tools.isEmpty(lpd.get("var13")) ? "" : lpd.get("var13").toString();//人员类型
String DUTIES = Tools.isEmpty(lpd.get("var14"))?"":lpd.get("var14").toString();//职务 // String DUTIES = Tools.isEmpty(lpd.get("var14")) ? "" : lpd.get("var14").toString();//职务
String TITLE = Tools.isEmpty(lpd.get("var15"))?"":lpd.get("var15").toString();//职称 // String TITLE = Tools.isEmpty(lpd.get("var15")) ? "" : lpd.get("var15").toString();//职称
//
String TYPE_OF_WORK = Tools.isEmpty(lpd.get("var16"))?"":lpd.get("var16").toString();//工种 // String TYPE_OF_WORK = Tools.isEmpty(lpd.get("var16")) ? "" : lpd.get("var16").toString();//工种
String ENTRY_DATE = Tools.isEmpty(lpd.get("var17"))?"":lpd.get("var17").toString();//入职日期 // String ENTRY_DATE = Tools.isEmpty(lpd.get("var17")) ? "" : lpd.get("var17").toString();//入职日期
String WORKING_DATE = Tools.isEmpty(lpd.get("var18"))?"":lpd.get("var18").toString();//参加工作日期 // String WORKING_DATE = Tools.isEmpty(lpd.get("var18")) ? "" : lpd.get("var18").toString();//参加工作日期
//
String INCUMBENCY = Tools.isEmpty(lpd.get("var19"))?"":lpd.get("var19").toString();//在职情况 // String INCUMBENCY = Tools.isEmpty(lpd.get("var19")) ? "" : lpd.get("var19").toString();//在职情况
//
//
PageData minzu = dictionariesService.findByName(NATION,"0a0e406f27f74ee698fe9979d25f62dd");//民族 // PageData minzu = dictionariesService.findByName(NATION, "0a0e406f27f74ee698fe9979d25f62dd");//民族
if(null == minzu ){ // if (null == minzu) {
errorStr.append("第"+number+"行,"); // errorStr.append("第" + number + "行,");
errorStr.append("未找到该民族信息,请重新确认数据;\n"); // errorStr.append("未找到该民族信息,请重新确认数据;\n");
continue; // continue;
} // }
PageData xibei = dictionariesService.findByName(SEX,"21501808bbc344d593fbf9ccfe6c4531");//性别 // PageData xibei = dictionariesService.findByName(SEX, "21501808bbc344d593fbf9ccfe6c4531");//性别
if(null == xibei ){ // if (null == xibei) {
errorStr.append("第"+number+"行,"); // errorStr.append("第" + number + "行,");
errorStr.append("未找到该性别信息,请重新确认数据;\n"); // errorStr.append("未找到该性别信息,请重新确认数据;\n");
continue; // continue;
} // }
PageData zhengzhimianmao = dictionariesService.findByName(POLITICAL_OUTLOOK,"6351efdd12dc4730952e5d195718e252");//政治面貌 // PageData zhengzhimianmao = dictionariesService.findByName(POLITICAL_OUTLOOK, "6351efdd12dc4730952e5d195718e252");//政治面貌
if(null == zhengzhimianmao ){ // if (null == zhengzhimianmao) {
errorStr.append("第"+number+"行,"); // errorStr.append("第" + number + "行,");
errorStr.append("未找到政治面貌信息,请重新确认数据;\n"); // errorStr.append("未找到政治面貌信息,请重新确认数据;\n");
continue; // continue;
} // }
Pattern pattern = Pattern.compile("[0-9]*"); // Pattern pattern = Pattern.compile("[0-9]*");
Date beginDate = DateUtil.fomatDate("1900-01-01"); // 1900, 0, 1 // Date beginDate = DateUtil.fomatDate("1900-01-01"); // 1900, 0, 1
Matcher isNum = pattern.matcher(DATE_OF_BIRTH); //判断是否为数字 // Matcher isNum = pattern.matcher(DATE_OF_BIRTH); //判断是否为数字
Date DATE_OF_BIRTH_VAL = new Date(); // Date DATE_OF_BIRTH_VAL = new Date();
if( isNum.matches() ){ // if (isNum.matches()) {
DATE_OF_BIRTH_VAL = DateUtil.getDateAfter(beginDate,Integer.parseInt(DATE_OF_BIRTH)); // DATE_OF_BIRTH_VAL = DateUtil.getDateAfter(beginDate, Integer.parseInt(DATE_OF_BIRTH));
// } else {
// DATE_OF_BIRTH_VAL = DateUtil.fomatDateByNian(DATE_OF_BIRTH);//出生年学
// }
// PageData wenhuyachengdu = dictionariesService.findByName(DEGREE_OF_EDUCATION, "d7d80f08d73a4accbccf4fd3d8d1d867");//文化程度
// if (null == wenhuyachengdu) {
// errorStr.append("第" + number + "行,");
// errorStr.append("未找到文化程度信息,请重新确认数据;\n");
// continue;
// }
// PageData renyuanleixing = new PageData();
// if (!Tools.isEmpty(PERSONNEL_TYPE)) {//人员类型
// renyuanleixing = dictionariesService.findByName(PERSONNEL_TYPE, "0b62f92b0b624aab8e89a77304a64d5e");//人员类型
// if (null == renyuanleixing) {
// errorStr.append("第" + number + "行,");
// errorStr.append("未找到人员类型信息,请重新确认数据;\n");
// continue;
// }
//
// }
// PageData zhiwu = dictionariesCorpService.findByName(DUTIES, Jurisdiction.getCORPINFO_ID(), "09e36ac01e9540f8bc84eab1c1a78754");//职务
// if (null == zhiwu) { //如果数据库没有这个职务，新增职务
// zhiwu = new PageData();
// zhiwu.put("PARENT_ID", "09e36ac01e9540f8bc84eab1c1a78754");
// zhiwu.put("BIANMA", "zhiwu");
// zhiwu.put("NAME", DUTIES);
// zhiwu = dictionariesCorpService.saveByZidongxinzeng(zhiwu);
// }
// PageData zhicheng = dictionariesCorpService.findByName(TITLE, Jurisdiction.getCORPINFO_ID(), "945a6b10e59946078b500f0fbafa8679");//职称
// if (null == zhicheng) { //如果数据库没有这个职称，新增职称
// zhicheng = new PageData();
// zhicheng.put("PARENT_ID", "945a6b10e59946078b500f0fbafa8679");
// zhicheng.put("BIANMA", "zhicheng");
// zhicheng.put("NAME", TITLE);
// zhicheng = dictionariesCorpService.saveByZidongxinzeng(zhicheng);
// }
// PageData gongzhong = dictionariesCorpService.findByName(TYPE_OF_WORK, Jurisdiction.getCORPINFO_ID(), "55484e491a5e442d839c4595380713ec");//工种
// if (null == gongzhong) { //如果数据库没有这个工种，新增工种
// gongzhong = new PageData();
// gongzhong.put("PARENT_ID", "55484e491a5e442d839c4595380713ec");
// gongzhong.put("BIANMA", "gongzhong");
// gongzhong.put("NAME", TYPE_OF_WORK);
// gongzhong = dictionariesCorpService.saveByZidongxinzeng(gongzhong);
// }
//
// Date ENTRY_DATE_VAL = new Date();//入职日期
// Matcher isNum2 = pattern.matcher(ENTRY_DATE);
// if (isNum2.matches()) {
// ENTRY_DATE_VAL = DateUtil.getDateAfter(beginDate, Integer.parseInt(ENTRY_DATE));
// } else {
// ENTRY_DATE_VAL = DateUtil.fomatDateByNian(ENTRY_DATE);
// }
//
// Date WORKING_DATE_VAL = new Date();//参加工作日期
// Matcher isNum3 = pattern.matcher(WORKING_DATE);
// if (isNum3.matches()) {
// WORKING_DATE_VAL = DateUtil.getDateAfter(beginDate, Integer.parseInt(WORKING_DATE));
// } else {
// WORKING_DATE_VAL = DateUtil.fomatDateByNian(WORKING_DATE);
// }
//
// PageData zaizhiqingkuang = dictionariesService.findByName(INCUMBENCY, "548764b5d4bf4bd7a18ef88274ef49e4");//在职情况
// if (null == zaizhiqingkuang) {
// errorStr.append("第" + number + "行,");
// errorStr.append("未找到在职情况信息,请重新确认数据;\n");
// continue;
// }
// String cardNo = userInfos.get(user.getString("CARDNO"));
// if (cardNo != null) {
// errorStr.append("第" + number + "行,");
// errorStr.append("该定位卡号" + cardNo + "系统中已存在,使用人为：" + userInfos.get("CARDNO") + "请重新确认数据;\n");
// continue;
// }
// user.put("USER_ID_CARD", USER_ID_CARD);
// user.put("NATION", minzu.get("DICTIONARIES_ID"));
// user.put("SEX", xibei.get("DICTIONARIES_ID"));
// user.put("POLITICAL_OUTLOOK", zhengzhimianmao.get("DICTIONARIES_ID"));
// user.put("DATE_OF_BIRTH", DATE_OF_BIRTH_VAL);
// user.put("DEGREE_OF_EDUCATION", wenhuyachengdu.get("DICTIONARIES_ID"));
// user.put("PERSONNEL_TYPE", renyuanleixing.get("DICTIONARIES_ID"));
// user.put("DUTIES", zhiwu.get("DICTIONARIES_ID"));
// user.put("TITLE", zhicheng.get("DICTIONARIES_ID"));
// user.put("TYPE_OF_WORK", gongzhong.get("DICTIONARIES_ID"));
// user.put("ENTRY_DATE", ENTRY_DATE_VAL);
// user.put("WORKING_DATE", WORKING_DATE_VAL);
// user.put("INCUMBENCY", zaizhiqingkuang.get("DICTIONARIES_ID"));
//
// }
if (userMap.containsKey(userName)) {
PageData useredit = JSON.parseObject(userMap.get(userName), PageData.class);
useredit.put("NAME", name);
useredit.put("CARDNO", CardNo);
useredit.put("ROLE_ID", role.getString("ROLE_ID"));
useredit.put("LAST_LOGIN", "");
useredit.put("IP", "");
useredit.put("STATUS", "0");
useredit.put("BZ", bz);
useredit.put("SKIN", "pcoded-navbar navbar-image-3,navbar pcoded-header navbar-expand-lg navbar-light header-dark,");
useredit.put("EMAIL", eMail);
useredit.put("NUMBER", "");
useredit.put("PHONE", "");
useredit.put("ROLE_IDS", "");
useredit.put("DEPARTMENT_ID", departId);
useredit.put("POST_ID", postId);
useredit.put("ISMAIN", "0");
useredit.put("FUN_IDS", "");
useredit.put("RIGHTS", "788664966448");
useredit.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
useredit.put("ISSTUDENT", "0");// 在线学习情况
useredit.put("DURATION", "-1");// 工作状态持
editUserList.add(useredit);
} else { } else {
DATE_OF_BIRTH_VAL = DateUtil.fomatDateByNian(DATE_OF_BIRTH);//出生年学
}
PageData wenhuyachengdu = dictionariesService.findByName(DEGREE_OF_EDUCATION,"d7d80f08d73a4accbccf4fd3d8d1d867");//文化程度
if(null == wenhuyachengdu ){
errorStr.append("第"+number+"行,");
errorStr.append("未找到文化程度信息,请重新确认数据;\n");
continue;
}
PageData renyuanleixing = new PageData();
if(!Tools.isEmpty(PERSONNEL_TYPE)){//人员类型
renyuanleixing = dictionariesService.findByName(PERSONNEL_TYPE,"0b62f92b0b624aab8e89a77304a64d5e");//人员类型
if(null == renyuanleixing ){
errorStr.append("第"+number+"行,");
errorStr.append("未找到人员类型信息,请重新确认数据;\n");
continue;
}
}
PageData zhiwu = dictionariesCorpService.findByName(DUTIES,Jurisdiction.getCORPINFO_ID(), "09e36ac01e9540f8bc84eab1c1a78754");//职务
if(null == zhiwu ){ //如果数据库没有这个职务，新增职务
zhiwu = new PageData();
zhiwu.put("PARENT_ID", "09e36ac01e9540f8bc84eab1c1a78754");
zhiwu.put("BIANMA", "zhiwu");
zhiwu.put("NAME", DUTIES);
zhiwu = dictionariesCorpService.saveByZidongxinzeng(zhiwu);
}
PageData zhicheng = dictionariesCorpService.findByName(TITLE,Jurisdiction.getCORPINFO_ID(), "945a6b10e59946078b500f0fbafa8679");//职称
if(null == zhicheng ){ //如果数据库没有这个职称，新增职称
zhicheng = new PageData();
zhicheng.put("PARENT_ID", "945a6b10e59946078b500f0fbafa8679");
zhicheng.put("BIANMA", "zhicheng");
zhicheng.put("NAME", TITLE);
zhicheng = dictionariesCorpService.saveByZidongxinzeng(zhicheng);
}
PageData gongzhong = dictionariesCorpService.findByName(TYPE_OF_WORK,Jurisdiction.getCORPINFO_ID(), "55484e491a5e442d839c4595380713ec");//工种
if(null == gongzhong ){ //如果数据库没有这个工种，新增工种
gongzhong = new PageData();
gongzhong.put("PARENT_ID", "55484e491a5e442d839c4595380713ec");
gongzhong.put("BIANMA", "gongzhong");
gongzhong.put("NAME",TYPE_OF_WORK);
gongzhong = dictionariesCorpService.saveByZidongxinzeng(gongzhong);
}
Date ENTRY_DATE_VAL = new Date();//入职日期
Matcher isNum2 = pattern.matcher(ENTRY_DATE);
if( isNum2.matches() ){
ENTRY_DATE_VAL = DateUtil.getDateAfter(beginDate,Integer.parseInt(ENTRY_DATE));
}else{
ENTRY_DATE_VAL = DateUtil.fomatDateByNian(ENTRY_DATE);
}
Date WORKING_DATE_VAL = new Date();//参加工作日期
Matcher isNum3 = pattern.matcher(WORKING_DATE);
if( isNum3.matches() ){
WORKING_DATE_VAL = DateUtil.getDateAfter(beginDate,Integer.parseInt(WORKING_DATE));
}else{
WORKING_DATE_VAL = DateUtil.fomatDateByNian(WORKING_DATE);
}
PageData zaizhiqingkuang = dictionariesService.findByName(INCUMBENCY,"548764b5d4bf4bd7a18ef88274ef49e4");//在职情况
if(null == zaizhiqingkuang ){
errorStr.append("第"+number+"行,");
errorStr.append("未找到在职情况信息,请重新确认数据;\n");
continue;
}
user.put("USER_ID_CARD", USER_ID_CARD);
user.put("NATION", minzu.get("DICTIONARIES_ID"));
user.put("SEX", xibei.get("DICTIONARIES_ID"));
user.put("POLITICAL_OUTLOOK", zhengzhimianmao.get("DICTIONARIES_ID"));
user.put("DATE_OF_BIRTH", DATE_OF_BIRTH_VAL);
user.put("DEGREE_OF_EDUCATION", wenhuyachengdu.get("DICTIONARIES_ID"));
user.put("PERSONNEL_TYPE", renyuanleixing.get("DICTIONARIES_ID"));
user.put("DUTIES", zhiwu.get("DICTIONARIES_ID"));
user.put("TITLE", zhicheng.get("DICTIONARIES_ID"));
user.put("TYPE_OF_WORK", gongzhong.get("DICTIONARIES_ID"));
user.put("ENTRY_DATE", ENTRY_DATE_VAL);
user.put("WORKING_DATE", WORKING_DATE_VAL);
user.put("INCUMBENCY", zaizhiqingkuang.get("DICTIONARIES_ID"));
}
addUserList.add(user); addUserList.add(user);
} }
}
// 进行定位卡号同步校验
for (PageData pageData : editUserList) {
String msg = usersService.changeOrUpdUserCardNo(pageData);
if (!msg.equals(Const.CAN_CHENG_USER)) {
errorStr.append("第" + number + "行,");
errorStr.append(msg+"\n");
}
}
for (PageData pageData : addUserList) {
if (PLSUtil.saveUser(pageData)) {
PageData cardNumberPeople = PLSUtil.getCardNumberPeople(pageData);
pageData.put("PLS_ID", cardNumberPeople.getString("psnId"));
}else {
errorStr.append("第" + number + "行,");
errorStr.append("人员定位系统用户添加失败，请联系管理员。"+"\n");
}
}
if (Tools.isEmpty(errorStr.toString())) { if (Tools.isEmpty(errorStr.toString())) {
for (PageData pageData : addUserList) { for (PageData pageData : addUserList) {
usersService.saveUser(pageData); usersService.saveUser(pageData);
if("1".equals(pageData.getString("zxxxType"))){ }
userInfoService.save(pageData); for (PageData pageData : editUserList) {
if (PLSUtil.editUser(pageData)) {
usersService.editUser(pageData);
} }
} }
errorStr.append("成功导入" + addUserList.size() + "条数据!"); errorStr.append("成功导入" + addUserList.size() + "条数据!");
errorStr.append("成功修改" + editUserList.size() + "条数据!");
} else { } else {
errInfo = "error"; errInfo = "error";
} }
@ -1623,7 +1716,9 @@ public class UsersController extends BaseController {
return map; return map;
} }
/**从EXCEL导入到数据库 /**
* 从EXCEL导入到数据库
*
* @param file * @param file
* @return * @return
* @throws Exception * @throws Exception
@ -1671,10 +1766,18 @@ public class UsersController extends BaseController {
header.add("用户名"); header.add("用户名");
header.add("姓名"); header.add("姓名");
// header.add("邮箱");header.add("备注");header.add("是否在线学习人员"); // header.add("邮箱");header.add("备注");header.add("是否在线学习人员");
header.add("身份证号");header.add("民族");header.add("性别"); header.add("身份证号");
header.add("政治面貌");header.add("出生年月");header.add("文化程度"); header.add("民族");
header.add("人员类型");header.add("职务");header.add("职称"); header.add("性别");
header.add("工种");header.add("入职日期");header.add("参加工种日期"); header.add("政治面貌");
header.add("出生年月");
header.add("文化程度");
header.add("人员类型");
header.add("职务");
header.add("职称");
header.add("工种");
header.add("入职日期");
header.add("参加工种日期");
header.add("在职情况"); header.add("在职情况");
try { try {
@ -2099,6 +2202,7 @@ public class UsersController extends BaseController {
/** /**
* 递归循环 找到父节点名称 * 递归循环 找到父节点名称
*
* @param parentId 部门父节点id * @param parentId 部门父节点id
* @param departMap 全部部门信息 * @param departMap 全部部门信息
* @param valName 部门名称 * @param valName 部门名称
@ -2118,7 +2222,10 @@ public class UsersController extends BaseController {
} }
return keyName.toString(); return keyName.toString();
} }
/** 获取当前登录用户ID
/**
* 获取当前登录用户ID
*
* @return * @return
* @throws Exception * @throws Exception
*/ */
@ -2133,7 +2240,9 @@ public class UsersController extends BaseController {
} }
/**查询公司所有用户 /**
* 查询公司所有用户
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@ -2155,6 +2264,7 @@ public class UsersController extends BaseController {
/** /**
* 显示列表listCascader * 显示列表listCascader
*
* @return * @return
*/ */
@RequestMapping(value = "/listCascader") @RequestMapping(value = "/listCascader")
@ -2215,6 +2325,7 @@ public class UsersController extends BaseController {
/** /**
* 显示列表listCascader * 显示列表listCascader
*
* @return * @return
*/ */
@RequestMapping(value = "/listCascaderByDeptLevel") @RequestMapping(value = "/listCascaderByDeptLevel")
@ -2273,8 +2384,11 @@ public class UsersController extends BaseController {
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**修改用户签字信息状态
/**
* 修改用户签字信息状态
* 安全生产机构负责人 和 记录人员 * 安全生产机构负责人 和 记录人员
*
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value = "/updataSignType") @RequestMapping(value = "/updataSignType")
@ -2310,7 +2424,10 @@ public class UsersController extends BaseController {
map.put("msg", msg); map.put("msg", msg);
return map; return map;
} }
/**列表
/**
* 列表
*
* @param * @param
* @throws Exception * @throws Exception
*/ */

5
src/main/java/com/zcloud/entity/PageData.java
View File

@ -66,7 +66,10 @@ public class PageData extends HashMap<Object, Object> implements Map<Object, Obj
public String getString(Object key) { public String getString(Object key) {
return get(key) == null ? null : get(key).toString().trim(); return get(key) == null ? null : get(key).toString().trim();
} }
@Override
public Object getOrDefault(Object key,Object defaultValue) {
return map.getOrDefault(key,defaultValue);
}
@Override @Override
public Object put(Object key, Object value) { public Object put(Object key, Object value) {
if (value instanceof ClobProxyImpl) { // 读取oracle Clob类型数据 if (value instanceof ClobProxyImpl) { // 读取oracle Clob类型数据

4
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -251,4 +251,8 @@ public interface UsersMapper {
PageData findByRegulatoryId(PageData pd); PageData findByRegulatoryId(PageData pd);
PageData findByIdForEmis(PageData pd); PageData findByIdForEmis(PageData pd);
PageData findByCardNo(PageData getCordNo);
List<PageData> getUserCardNoAll(PageData departPd);
} }

10
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -281,4 +281,14 @@ public interface UsersService {
*/ */
public PageData findByIdForEmis(PageData pd)throws Exception; public PageData findByIdForEmis(PageData pd)throws Exception;
/**
* @Description: 修改人员定位卡号
* @Author: dearLin
* @Date: 2024/1/24/024 14:12
* @Param: [com.zcloud.entity.PageData] [pd]
* @Return: boolean
*/
String changeOrUpdUserCardNo(PageData pd) throws Exception;
List<PageData> getUserCardNoAll(PageData departPd);
} }

186
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -16,6 +16,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* 说明：用户服务接口实现类 * 说明：用户服务接口实现类
* 作者：luoxiaobao * 作者：luoxiaobao
@ -36,7 +37,9 @@ public class UsersServiceImpl implements UsersService {
@Autowired @Autowired
private FHlogService FHLOG; private FHlogService FHLOG;
/**通过用户名获取用户信息 /**
* 通过用户名获取用户信息
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -44,11 +47,14 @@ public class UsersServiceImpl implements UsersService {
public PageData findByUsername(PageData pd) throws Exception { public PageData findByUsername(PageData pd) throws Exception {
return usersMapper.findByUsername(pd); return usersMapper.findByUsername(pd);
} }
public PageData findByName(PageData pd) throws Exception { public PageData findByName(PageData pd) throws Exception {
return usersMapper.findByName(pd); return usersMapper.findByName(pd);
} }
/**通过用户ID获取用户信息 /**
* 通过用户ID获取用户信息
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -57,7 +63,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findById(pd); return usersMapper.findById(pd);
} }
/**通 /**
* 通
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -66,7 +74,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listUserAndDept(pd); return usersMapper.listUserAndDept(pd);
} }
/** 获取获取部门账号 /**
* 获取获取部门账号
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -75,7 +85,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listUserbyDep(pd); return usersMapper.listUserbyDep(pd);
} }
/**用户列表 /**
* 用户列表
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -83,10 +95,14 @@ public class UsersServiceImpl implements UsersService {
public List<PageData> userlistPage(Page page) throws Exception { public List<PageData> userlistPage(Page page) throws Exception {
return usersMapper.userlistPage(page); return usersMapper.userlistPage(page);
} }
public List<PageData> listAll(PageData pd) throws Exception { public List<PageData> listAll(PageData pd) throws Exception {
return usersMapper.listAll(pd); return usersMapper.listAll(pd);
} }
/**用户列表
/**
* 用户列表
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -95,7 +111,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.userSelectlistPage(page); return usersMapper.userSelectlistPage(page);
} }
/**通过用户ID获取用户信息和角色信息 /**
* 通过用户ID获取用户信息和角色信息
*
* @param USER_ID * @param USER_ID
* @return * @return
* @throws Exception * @throws Exception
@ -104,7 +122,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.getUserAndRoleById(USER_ID); return usersMapper.getUserAndRoleById(USER_ID);
} }
/**保存用户IP /**
* 保存用户IP
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -112,7 +132,9 @@ public class UsersServiceImpl implements UsersService {
usersMapper.saveIP(pd); usersMapper.saveIP(pd);
} }
/**通过邮箱获取数据 /**
* 通过邮箱获取数据
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -121,7 +143,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findByEmail(pd); return usersMapper.findByEmail(pd);
} }
/**通过编码获取数据 /**
* 通过编码获取数据
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -130,7 +154,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findByNumbe(pd); return usersMapper.findByNumbe(pd);
} }
/**列出某角色下的所有用户 /**
* 列出某角色下的所有用户
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -139,7 +165,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listAllUserByRoldId(pd); return usersMapper.listAllUserByRoldId(pd);
} }
/**用户列表(全部) /**
* 用户列表(全部)
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -148,7 +176,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listAllUser(pd); return usersMapper.listAllUser(pd);
} }
/**查询部门下用户 /**
* 查询部门下用户
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -157,7 +187,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listUserByDept(pd); return usersMapper.listUserByDept(pd);
} }
/**用户列表(弹窗选择用) /**
* 用户列表(弹窗选择用)
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
@ -166,7 +198,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.userBystafflistPage(page); return usersMapper.userBystafflistPage(page);
} }
/**保存用户 /**
* 保存用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -174,7 +208,9 @@ public class UsersServiceImpl implements UsersService {
usersMapper.saveUser(pd); usersMapper.saveUser(pd);
} }
/**保存用户系统皮肤 /**
* 保存用户系统皮肤
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -182,18 +218,23 @@ public class UsersServiceImpl implements UsersService {
usersMapper.saveSkin(pd); usersMapper.saveSkin(pd);
} }
/**修改用户 /**
* 修改用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void editUser(PageData pd) throws Exception { public void editUser(PageData pd) throws Exception {
usersMapper.editUser(pd); usersMapper.editUser(pd);
} }
public void editUserState(PageData pd) throws Exception { public void editUserState(PageData pd) throws Exception {
usersMapper.editUserState(pd); usersMapper.editUserState(pd);
} }
/**通过USERID查监管端用户 /**
* 通过USERID查监管端用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -205,12 +246,46 @@ public class UsersServiceImpl implements UsersService {
public PageData findByIdForEmis(PageData pd) throws Exception { public PageData findByIdForEmis(PageData pd) throws Exception {
return usersMapper.findByIdForEmis(pd); return usersMapper.findByIdForEmis(pd);
} }
@Override
public String changeOrUpdUserCardNo(PageData nowuser) throws Exception {
PageData oldUser = usersMapper.findById(nowuser);
// 先判断人员新的定位卡号是否有变化，没变化直接可以修改
if (oldUser.getString("CARDNO").equals(nowuser.getString("CARDNO"))) {
return Const.CAN_CHENG_USER;
}
// 有变化看库里是否有人在用这个新卡号
PageData getCordNo = new PageData();
getCordNo.putAll(nowuser);
getCordNo.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
PageData usedCardNo = usersMapper.findByCardNo(getCordNo);
// 卡号被本系统中他人使用了
if (usedCardNo != null) {
return Const.CARD_ALREADY_BEEN_USED+usedCardNo.getString("NAME");
}
PageData cardNumberPeople = PLSUtil.getCardNumberPeople(nowuser);
// 这个新卡号其他系统中绑定人了
if (cardNumberPeople != null) {
return "人员定位系统中"+Const.CARD_ALREADY_BEEN_USED+cardNumberPeople.getString("name");
}
return Const.CAN_CHENG_USER;
}
@Override
public List<PageData> getUserCardNoAll(PageData departPd) {
return usersMapper.getUserCardNoAll(departPd);
}
@Override @Override
public void saveUserNew(PageData pd) throws Exception { public void saveUserNew(PageData pd) throws Exception {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("WORKSTATUS", "1"); pd.put("WORKSTATUS", "1");
pd.put("WORKPERIOD", "1"); pd.put("WORKPERIOD", "1");
pd.put("RIGHTS", "788664966448"); pd.put("RIGHTS", "788664966448");
// 先判断这个人定位卡号与姓名是否对的上
if (!PLSUtil.hasCardNumber(pd)) {
throw new Exception(pd.getString("CARDNO") + "定位卡已经存在");
}
if (pd.get("USERAVATARURL") != null && !pd.getString("USERAVATARURL").equals("")) { if (pd.get("USERAVATARURL") != null && !pd.getString("USERAVATARURL").equals("")) {
String USERAVATARURL64 = ImageAnd64Binary.zipBase64(pd.getString("USERAVATARURL")); String USERAVATARURL64 = ImageAnd64Binary.zipBase64(pd.getString("USERAVATARURL"));
@ -235,7 +310,7 @@ public class UsersServiceImpl implements UsersService {
pd.put("SKIN", "pcoded-navbar navbar-image-3, navbar pcoded-header navbar-expand-lg navbar-light header-dark"); pd.put("SKIN", "pcoded-navbar navbar-image-3, navbar pcoded-header navbar-expand-lg navbar-light header-dark");
pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString()); pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString());
if (usersMapper.findByUsername(pd) == null) { if (usersMapper.findByUsername(pd) == null && PLSUtil.saveUser(pd)) {
if ("true".equals(pd.getString("ISSTUDENT"))) { if ("true".equals(pd.getString("ISSTUDENT"))) {
if ("select".equals(pd.getString("letDutiesType"))) { if ("select".equals(pd.getString("letDutiesType"))) {
pd.put("DUTIES", pd.getString("DUTIES")); pd.put("DUTIES", pd.getString("DUTIES"));
@ -269,17 +344,12 @@ public class UsersServiceImpl implements UsersService {
} }
userInfoService.save(pd); userInfoService.save(pd);
} }
PageData cardNumberPeople = PLSUtil.getCardNumberPeople(pd);
pd.put("PLS_ID", cardNumberPeople.getString("psnId"));
usersMapper.saveUser(pd); usersMapper.saveUser(pd);
FHLOG.save(Jurisdiction.getUsername(), "新增用户：" + pd.getString("USERNAME")); FHLOG.save(Jurisdiction.getUsername(), "新增用户：" + pd.getString("USERNAME"));
if (PLSUtil.getToken(pd)) {
PLSUtil.saveUser(pd);
} else { } else {
throw new Exception("无法获取有效的Token"); throw new Exception("请检查定位卡号与用户名是否重复");
}
} else {
throw new Exception("用户名已存在");
} }
} }
@ -288,7 +358,9 @@ public class UsersServiceImpl implements UsersService {
usersMapper.editPassword(pd); usersMapper.editPassword(pd);
} }
/**删除用户 /**
* 删除用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -296,18 +368,23 @@ public class UsersServiceImpl implements UsersService {
usersMapper.deleteUser(pd); usersMapper.deleteUser(pd);
} }
/**批量删除用户 /**
* 批量删除用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void deleteAllUser(String[] USER_IDS) throws Exception { public void deleteAllUser(String[] USER_IDS) throws Exception {
usersMapper.deleteAllUser(USER_IDS); usersMapper.deleteAllUser(USER_IDS);
} }
public List<PageData> listUserBYids(String[] USER_IDS) throws Exception { public List<PageData> listUserBYids(String[] USER_IDS) throws Exception {
return usersMapper.listUserBYids(USER_IDS); return usersMapper.listUserBYids(USER_IDS);
} }
/**修改用户小程序权限 /**
* 修改用户小程序权限
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -315,7 +392,9 @@ public class UsersServiceImpl implements UsersService {
usersMapper.editUserFuns(pd); usersMapper.editUserFuns(pd);
} }
/**查询小程序用户 /**
* 查询小程序用户
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -324,15 +403,19 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findAppUserById(pd); return usersMapper.findAppUserById(pd);
} }
/**用户同意协议 /**
* 用户同意协议
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void agreeProtocol(PageData pd) throws Exception { public void agreeProtocol(PageData pd) throws Exception {
usersMapper.agreeProtocol(pd); usersMapper.agreeProtocol(pd);
} }
/** /**
* 获取该企业下所有用户，用户判断是否重复 * 获取该企业下所有用户，用户判断是否重复
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -341,8 +424,8 @@ public class UsersServiceImpl implements UsersService {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return usersMapper.findUserNameAll(pd); return usersMapper.findUserNameAll(pd);
} }
/** /**
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -354,6 +437,7 @@ public class UsersServiceImpl implements UsersService {
/** /**
* 获取账号及部门岗位 * 获取账号及部门岗位
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -365,6 +449,7 @@ public class UsersServiceImpl implements UsersService {
/** /**
* 查询公司员工总数 * 查询公司员工总数
*
* @param pd * @param pd
* @return * @return
*/ */
@ -374,6 +459,7 @@ public class UsersServiceImpl implements UsersService {
/** /**
* 查询公司检查过清单的员工总数 * 查询公司检查过清单的员工总数
*
* @param pd * @param pd
* @return * @return
*/ */
@ -383,6 +469,7 @@ public class UsersServiceImpl implements UsersService {
/** /**
* 查询用户倒班周期数据 * 查询用户倒班周期数据
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -391,7 +478,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.getUserWork(pd); return usersMapper.getUserWork(pd);
} }
/**修改用户倒班周期 /**
* 修改用户倒班周期
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
@ -399,7 +488,9 @@ public class UsersServiceImpl implements UsersService {
usersMapper.editShiftWork(pd); usersMapper.editShiftWork(pd);
} }
/**获取人员Cascader数据(人员ID，姓名，部门ID，部门级别) /**
* 获取人员Cascader数据(人员ID，姓名，部门ID，部门级别)
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -409,7 +500,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listCascader(pd); return usersMapper.listCascader(pd);
} }
/**清除在线学习人员分类 /**
* 清除在线学习人员分类
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -421,6 +514,7 @@ public class UsersServiceImpl implements UsersService {
/** /**
* 获取账号及部门岗位 * 获取账号及部门岗位
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -429,22 +523,30 @@ public class UsersServiceImpl implements UsersService {
public List<PageData> listUserDepPoslistPage(Page page) throws Exception { public List<PageData> listUserDepPoslistPage(Page page) throws Exception {
return usersMapper.listUserDepPoslistPage(page); return usersMapper.listUserDepPoslistPage(page);
} }
/** /**
* 更新用户pushcid * 更新用户pushcid
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void updatePushCid(PageData pd) throws Exception { public void updatePushCid(PageData pd) throws Exception {
usersMapper.updatePushCid(pd); usersMapper.updatePushCid(pd);
} }
/**修改公司名称时同步修改企业账号
/**
* 修改公司名称时同步修改企业账号
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void updateCornUser(PageData pd) throws Exception { public void updateCornUser(PageData pd) throws Exception {
usersMapper.updateCornUser(pd); usersMapper.updateCornUser(pd);
} }
/**查询用户名称及部门名称
/**
* 查询用户名称及部门名称
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -453,7 +555,9 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findUserDept(pd); return usersMapper.findUserDept(pd);
} }
/**用户列表(本部门及所有上级部门领导负责人) /**
* 用户列表(本部门及所有上级部门领导负责人)
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
@ -486,7 +590,9 @@ public class UsersServiceImpl implements UsersService {
} }
} }
/**获取账号及部门岗位 /**
* 获取账号及部门岗位
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception

4
src/main/java/com/zcloud/util/Const.java
View File

@ -68,4 +68,8 @@ public class Const {
public static final String ENDPOINT = "vod.cn-beijing.aliyuncs.com";// 访问的域名 public static final String ENDPOINT = "vod.cn-beijing.aliyuncs.com";// 访问的域名
public static final String TOPIC_EIGHTWORK="eightWork_whb_chen"; public static final String TOPIC_EIGHTWORK="eightWork_whb_chen";
// 修改用户相关
public static final String CAN_CHENG_USER="SUCCEEDS";
public static final String CARD_ALREADY_BEEN_USED="当前卡号已经被使用。使用人：";
} }

18
src/main/java/com/zcloud/util/DateUtil.java
View File

@ -193,6 +193,21 @@ public class DateUtil {
return dateStr; return dateStr;
} }
/**
* 当前时间加n小时之后的时间
* @param days
* @return
*/
public static String getAfterHourDate(String hours) {
int hoursInt = Integer.parseInt(hours);
Calendar canlendar = Calendar.getInstance(); // java.util包
canlendar.add(Calendar.HOUR, hoursInt); // 日期减 如果不够减会将月变动
Date date = canlendar.getTime();
SimpleDateFormat sdfd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateStr = sdfd.format(date);
return dateStr;
}
/** /**
* 得到n天之后是周几 * 得到n天之后是周几
* @param days * @param days
@ -759,7 +774,8 @@ public class DateUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(getHalfYearMonth(true)); String afterHourDate = DateUtil.getAfterHourDate("12");
System.out.println(afterHourDate);
} }

439
src/main/java/com/zcloud/util/PLSUtil.java
View File

@ -1,5 +1,6 @@
package com.zcloud.util; package com.zcloud.util;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zcloud.entity.Camera; import com.zcloud.entity.Camera;
import com.zcloud.entity.Card; import com.zcloud.entity.Card;
@ -8,279 +9,250 @@ import com.zcloud.entity.PageData;
import com.zcloud.service.corp.CorpPlsInfoService; import com.zcloud.service.corp.CorpPlsInfoService;
import com.zcloud.service.system.UsersService; import com.zcloud.service.system.UsersService;
import okhttp3.*; import okhttp3.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.*;
import java.util.Map;
@Component
public class PLSUtil { public class PLSUtil {
private static final Logger logger = LoggerFactory.getLogger(PLSUtil.class);
private static CorpPlsInfoService corpplsinfoService;
private static UsersService usersService;
// 后台地址
public static HashMap<String, String> BAKEADDR = new HashMap<>();
@Autowired @Autowired
public static CorpPlsInfoService corpplsinfoService; public void setCorpplsinfoService(CorpPlsInfoService corpplsinfoServicebean, UsersService usersServicebean) {
@Autowired corpplsinfoService = corpplsinfoServicebean;
public static UsersService usersService; usersService = usersServicebean;
}
@PostConstruct
private void initBakeAddr() throws Exception {
List<PageData> dataList = corpplsinfoService.listAll(new PageData());
dataList.forEach(item -> {
BAKEADDR.put(item.getString("CORPINFO_ID"), item.getString("POST_URL"));
});
}
/** /**
* 验证登录 * @Description: 获取token
* @param pd * @Author: dearLin
* @return * @Date: 2024/1/24/024 9:59
* @throws Exception * @Param: [] []
* @Return: java.lang.String
*/ */
public static boolean getToken(PageData pd) throws Exception { public static String getToken() throws Exception {
boolean tokenUpdated = false; PageData pd = new PageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd = corpplsinfoService.findById(pd); pd = corpplsinfoService.findById(pd);
String token = pd.getString("TOKEN"); String token = pd.getString("TOKEN");
String backAddr = pd.getString("POST_URL");
String expireTime = pd.getString("EXPIRE_TIME"); String expireTime = pd.getString("EXPIRE_TIME");
String userName = pd.getString("ACCOUNT"); String userName = pd.getString("ACCOUNT");
String passWord = pd.getString("PASSWORD"); String passWord = pd.getString("PASSWORD");
String loginUrl = pd.getString("POST_URL") + "/auth/login"; String loginUrl = pd.getString("POST_URL") + "/auth/login";
if (token == null || expireTime == null || expireTime.trim().isEmpty() || DateUtil.compareDate(DateUtil.getTime(), expireTime)) { if (token == null || expireTime == null || expireTime.trim().isEmpty() || DateUtil.compareDate(DateUtil.getTime(), expireTime)) {
JSONObject loginPayload = new JSONObject(); JSONObject loginPayload = new JSONObject();
loginPayload.put("username", userName); loginPayload.put("username", userName);
loginPayload.put("password", passWord); loginPayload.put("password", passWord);
loginPayload.put("isPresentationMode", "2"); loginPayload.put("isPresentationMode", "2");
PageData response = sendPostHttpRequest(loginUrl, loginPayload.toJSONString(), null);
Response response = sendPostHttpRequest(loginPayload.toJSONString(), loginUrl,null); if (response != null) {
if (response.isSuccessful()) { PageData valueData = JSONObject.parseObject(response.getString("data"), PageData.class);
String responseBody = response.body().string(); token = valueData.getString("access_token");
JSONObject responseJSON = new JSONObject(responseBody.isEmpty()); String newExpireTime = DateUtil.getAfterHourDate("12");
JSONObject data = responseJSON.getJSONObject("data");
token = data.getString("access_token");
String newExpireTime = DateUtil.getAfterDayDate("1");
pd.put("TOKEN", token); pd.put("TOKEN", token);
pd.put("EXPIRE_TIME", newExpireTime); pd.put("EXPIRE_TIME", newExpireTime);
corpplsinfoService.edit(pd); corpplsinfoService.edit(pd);
tokenUpdated = true; return token;
} else { } else {
System.out.println("登录失败" + response.code()); System.out.println("登录失败");
} }
} else {
tokenUpdated = true;
} }
return tokenUpdated; return token;
}
/**
* @Description: 查询这个人的定位卡号是否存在
* @Author: dearLin
* @Date: 2024/1/24/024 10:00
* @Param: [com.zcloud.entity.PageData] [user]
* @Return: void
*/
public static boolean hasCardNumber(PageData user) throws Exception {
// 根据 定位卡号获取对应的人
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
PageData response = sendGetHttpRequest(url, null, getToken());
if (response != null) {
if (!"200".equals(response.getString("code"))) {
return false;
}
List<PageData> dataList = JSONObject.parseArray(response.getString("data"), PageData.class);
return dataList.isEmpty();
}
return false;
} }
/** /**
* 新增员工信息 * @Description: 查询这个人的定位卡号是否存在
* @param pd * @Author: dearLin
* @throws Exception * @Date: 2024/1/24/024 10:00
* @Param: [com.zcloud.entity.PageData] [user]
* @Return: void
*/ */
public static void saveUser(PageData pd) throws Exception { public static PageData getCardNumberPeople(PageData user) throws Exception {
if (getToken(pd)) { // 根据 定位卡号获取对应的人
PageData user = usersService.findByUsername(pd); String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
EmployeeData employeeData = new EmployeeData(); PageData response = sendGetHttpRequest(url, null, getToken());
if (response != null) {
if (user == null) { if (!"200".equals(response.getString("code"))) {
employeeData.setName(user.getString("NAME")); return null;
employeeData.setAvatar(user.getString("USERAVATARPREFIX") + user.getString("USERAVATARURL"));
employeeData.setCardNo(user.getString("CARDNO"));
employeeData.setSex(user.getString("SEX"));
employeeData.setPhone(user.getString("PHONE"));
} }
List<PageData> dataList = JSONObject.parseArray(response.getString("data"), PageData.class);
pd = corpplsinfoService.findById(pd); return dataList.size() > 0 ? dataList.get(0) : null;
String token = pd.getString("TOKEN");
String url = pd.getString("POST_URL") + "/deploy/psnmgmt/insertPsnInfo";
Response response = sendPostHttpRequest(url,employeeData.toString(),token);
if (!response.isSuccessful()) {
throw new IOException("请求失败:" + response);
}
} else {
throw new Exception("无法获取有效的Token");
} }
return null;
} }
/** /**
* 修改人员卡 * @Description: 把人新增到 人员定位系统
* @param pd * @Author: dearLin
* @throws Exception * @Date: 2024/1/24/024 10:00
* @Param: [com.zcloud.entity.PageData] [user]
* @Return: void
*/ */
public static void updateUserCardInfo(PageData pd) throws Exception { public static boolean saveUser(PageData user) throws Exception {
Card card = new Card(); String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon";
if (getToken(pd)){ JSONObject loginPayload = new JSONObject();
card.setCardNo(pd.getString("CARDNO")); loginPayload.put("name", user.getString("NAME"));
card.setPsnId(pd.getString("PsnId")); loginPayload.put("cardNo", user.getString("CARDNO"));
card.setCardType(pd.getString("CARDTYPE")); loginPayload.put("empNo", "");
card.setCardStatus(pd.getString("CARDSTATUS")); loginPayload.put("sex", "");
card.setRemark(pd.getString("REMARK")); loginPayload.put("certType", "");
loginPayload.put("certNo", "");
pd = corpplsinfoService.findById(pd); loginPayload.put("office", "");
String token = pd.getString("TOKEN"); loginPayload.put("staffType", "");
String url = pd.getString("POST_URL") + "/deploy/card"; loginPayload.put("phone", "");
loginPayload.put("empId", "");
Response response = sendPutHttpRequest(url, card.toString(), token); loginPayload.put("age", "");
if (!response.isSuccessful()) { loginPayload.put("addr", "");
throw new IOException("请求失败:" + response); loginPayload.put("remark", "");
} loginPayload.put("enterpriseName", "");
}else { loginPayload.put("officeName", "");
throw new Exception("无法获取有效的Token"); loginPayload.put("jobsName", "");
} loginPayload.put("deptName", "");
loginPayload.put("deptId", "");
loginPayload.put("avatar", "");
PageData response = sendPostHttpRequest(url, loginPayload.toJSONString(), getToken());
return "200".equals(response.getString("code"));
} }
/** /**
* 根据人员卡卡号获取人员信息 * @Description: 把人新增到 人员定位系统
* @param pd * @Author: dearLin
* @return * @Date: 2024/1/24/024 10:00
* @throws Exception * @Param: [com.zcloud.entity.PageData] [user]
* @Return: void
*/ */
public static JSONObject cardIdGetUserInfo(PageData pd) throws Exception { public static boolean editUser(PageData user) throws Exception {
JSONObject result = null; String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById";
if (getToken(pd)){ JSONObject loginPayload = new JSONObject();
pd = corpplsinfoService.findById(pd); loginPayload.put("name", user.getString("NAME"));
String token = pd.getString("TOKEN"); loginPayload.put("psnId", user.getString("PLS_ID"));
String cardId = pd.getString("CARDNO"); loginPayload.put("cardNo", user.getString("CARDNO"));
String url = pd.getString("POST_URL") + "/deploy/psnmgt/feign-client/getPsnInfoByCardId/" + cardId; loginPayload.put("empNo", "");
loginPayload.put("sex", "");
Response response = sendGetHttpRequest(url, null, token); loginPayload.put("certType", "");
if (response.isSuccessful()){ loginPayload.put("certNo", "");
String responseBody = response.body().string(); loginPayload.put("office", "");
result = new JSONObject(responseBody.isEmpty()); loginPayload.put("staffType", "");
}else { loginPayload.put("phone", "");
throw new IOException("请求失败:" + response); loginPayload.put("empId", "");
loginPayload.put("age", "");
loginPayload.put("addr", "");
loginPayload.put("remark", "");
loginPayload.put("enterpriseName", "");
loginPayload.put("officeName", "");
loginPayload.put("jobsName", "");
loginPayload.put("deptName", "");
loginPayload.put("deptId", "");
loginPayload.put("avatar", "");
PageData response = sendPostHttpRequest(url, loginPayload.toJSONString(), getToken());
return "200".equals(response.getString("code"));
} }
}else { public static boolean removeUser(PageData user) throws Exception {
throw new Exception("无法获取有效的Token"); String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt";
} PageData removeUser = usersService.findById(user);
PageData response = sendDeleteHttpRequest(url, Long.parseLong(removeUser.getString("PLS_ID")), getToken());
return result; return "200".equals(response.getString("code"));
} }
/** /**
* 添加摄像头 * 发送get类型请求
* @param pd *
* @throws Exception * @param url
* @param queryParams
* @param token
* @return PageData
* @throws IOException
*/ */
public static void saveCamera(PageData pd) throws Exception {
Camera camera = new Camera();
if (getToken(pd)) {
camera.setCamName(pd.getString("CAMNAME"));
camera.setCamNo(pd.getString("CAMNO"));
camera.setCamIp(pd.getString("CAMIP"));
camera.setPort(pd.getString("PORT"));
camera.setType(pd.getString("TYPE"));
camera.setCamUserName(pd.getString("CAMUSERNAME"));
camera.setCamPassword(pd.getString("CAMPASSWORD"));
camera.setLon(pd.getString("LON"));
camera.setAlt(pd.getString("ALT"));
camera.setChannel(pd.getString("CHANNEL"));
camera.setIndexcode(pd.getString("INDEXCODE"));
pd = corpplsinfoService.findById(pd); private static PageData sendGetHttpRequest(String url, Map<String, String> queryParams, String token) throws IOException {
String token = pd.getString("TOKEN"); OkHttpClient client = new OkHttpClient();
String url = pd.getString("POST_URL") + "/device/camera";
Response response = sendPostHttpRequest(url, String.valueOf(camera), token); HttpUrl.Builder httpBuilder = Objects.requireNonNull(HttpUrl.parse(url)).newBuilder();
if (!response.isSuccessful()){ //封装请求参数
throw new IOException("请求失败:" + response); if (queryParams != null) {
for (Map.Entry<String, String> param : queryParams.entrySet()) {
httpBuilder.addQueryParameter(param.getKey(), param.getValue());
} }
}else {
throw new Exception("无法获取有效的Token");
} }
//设置请求的url
Request.Builder requestBuilder = new Request.Builder()
.url(httpBuilder.build());
if (token != null && !token.isEmpty()) {
requestBuilder.addHeader("Authorization", "Bearer " + token);
} }
/** Request request = requestBuilder.build();
* 修改摄像头基本信息 Response execute = client.newCall(request).execute();
* @param pd if (execute.code() != 200) {
* @throws Exception logger.error("get请求失败，返回状态码：{},url:{}", execute.code(), url);
*/ throw new RuntimeException("get请求失败");
public static void updateCamera(PageData pd) throws Exception {
Camera camera = new Camera();
if (getToken(pd)){
camera.setCamName(pd.getString("CAMNAME"));
camera.setCamNo(pd.getString("CAMNO"));
camera.setCamIp(pd.getString("CAMIP"));
camera.setPort(pd.getString("PORT"));
camera.setType(pd.getString("TYPE"));
camera.setCamUserName(pd.getString("CAMUSERNAME"));
camera.setCamPassword(pd.getString("CAMPASSWORD"));
camera.setLon(pd.getString("LON"));
camera.setAlt(pd.getString("ALT"));
camera.setChannel(pd.getString("CHANNEL"));
camera.setIndexcode(pd.getString("INDEXCODE"));
pd = corpplsinfoService.findById(pd);
String token = pd.getString("TOKEN");
String url = pd.getString("POST_URL") + "/device/camera";
Response response = sendPutHttpRequest(url, String.valueOf(camera), token);
if (!response.isSuccessful()){
throw new IOException("请求失败:" + response);
}
}else {
throw new Exception("无法获取有效的Token");
}
}
/**
* 获取电子围栏列表
* @param pd
* @return
* @throws Exception
*/
public static JSONObject getAListOfElectronicFences(PageData pd) throws Exception {
if (getToken(pd)) {
pd = corpplsinfoService.findById(pd);
String token = pd.getString("TOKEN");
String url = pd.getString("POST_URL") + "/region/api/electronicFence/getAListOfElectronicFences";
Response response = sendGetHttpRequest(url, null, token);
if (response.isSuccessful()){
String responseBody = response.body().string();
return new JSONObject(responseBody.isEmpty());
}else {
throw new IOException("请求失败:" + response);
}
}else {
throw new Exception("无法获取有效的Token");
}
}
/**
* 告警统计
* @param pd
* @return
* @throws Exception
*/
public static JSONObject getAlarmStatistics(PageData pd) throws Exception {
JSONObject result = null;
if (getToken(pd)){
pd = corpplsinfoService.findById(pd);
String token = pd.getString("TOKEN");
Map<String,String> queryParams = new HashMap<>();
queryParams.put("type",pd.getString("week"));
String url = pd.getString("POST_URL") + "/region/alarm/alarmStatistics";
Response response = sendGetHttpRequest(url, queryParams, token);
if (response.isSuccessful()){
String responseBody = response.body().string();
return new JSONObject(responseBody.isEmpty());
}else {
throw new IOException("请求失败:" + response);
}
}else {
throw new Exception("无法获取有效的Token");
} }
return JSONObject.parseObject(execute.body().string(), PageData.class);
//发送请求并返回响应数据
} }
/** /**
* 发送post类型请求 * 发送post类型请求
*
* @param url * @param url
* @param jsonPayload * @param jsonPayload
* @param token * @param token
* @return * @return
* @throws IOException * @throws IOException
*/ */
private static Response sendPostHttpRequest(String url, String jsonPayload, String token) throws IOException { private static PageData sendPostHttpRequest(String url, String jsonPayload, String token) throws IOException {
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
MediaType JSON = MediaType.parse("application/json; charset=utf-8"); MediaType JSON = MediaType.parse("application/json; charset=utf-8");
RequestBody body = RequestBody.create(JSON, jsonPayload); RequestBody body = RequestBody.create(JSON, jsonPayload);
Request.Builder builder = new Request.Builder() // 构建一个新的Request对象。 Request.Builder builder = new Request.Builder() // 构建一个新的Request对象。
.url(url)// 设置请求的URL。 .url(url)// 设置请求的URL。
.post(body);// 设置请求的方法为POST，并设置请求体。 .post(body);// 设置请求的方法为POST，并设置请求体。
//构建请求头 //构建请求头
if (token != null && !token.isEmpty()) {// 检查token是否存在且不为空。 if (token != null && !token.isEmpty()) {// 检查token是否存在且不为空。
builder.addHeader("Authorization", "Bearer " + token); builder.addHeader("Authorization", "Bearer " + token);
@ -288,12 +260,22 @@ public class PLSUtil {
// 构建请求 // 构建请求
Request request = builder.build(); Request request = builder.build();
Response execute = client.newCall(request).execute();
if (execute.code() != 200) {
logger.error("post请求失败，返回状态码：{},url:{}", execute.code(), url);
throw new RuntimeException("get请求失败");
}
PageData pageData = JSONObject.parseObject(execute.body().string(), PageData.class);
if (!"200".equals(pageData.getString("code"))) {
logger.error("post请求失败，返回值：{},url:{}", pageData.getString("msg"), url);
}
return pageData;
//发起请求并响应数据 //发起请求并响应数据
return client.newCall(request).execute();
} }
/** /**
* 发送PUT类型请求 * 发送PUT类型请求
*
* @param url * @param url
* @param jsonPayload * @param jsonPayload
* @param token * @param token
@ -315,51 +297,20 @@ public class PLSUtil {
return client.newCall(request).execute(); return client.newCall(request).execute();
} }
/**
* 发送get类型请求
* @param url
* @param queryParams
* @param token
* @return
* @throws IOException
*/
private static Response sendGetHttpRequest(String url, Map<String, String> queryParams, String token) throws IOException {
OkHttpClient client = new OkHttpClient();
HttpUrl.Builder httpBuilder = HttpUrl.parse(url).newBuilder();
//封装请求参数
if (queryParams != null) {
for (Map.Entry<String, String> param : queryParams.entrySet()) {
httpBuilder.addQueryParameter(param.getKey(), param.getValue());
}
}
//设置请求的url
Request.Builder requestBuilder = new Request.Builder()
.url(httpBuilder.build());
if (token != null && !token.isEmpty()) {
requestBuilder.addHeader("Authorization", "Bearer " + token);
}
Request request = requestBuilder.build();
//发送请求并返回响应数据
return client.newCall(request).execute();
}
/** /**
* 发送delete类型请求 * 发送delete类型请求
*
* @param url * @param url
* @param camIds * @param camIds
* @param token * @param token
* @return * @return
* @throws IOException * @throws IOException
*/ */
private static Response sendDeleteHttpRequest(String url, List<String> camIds, String token) throws IOException { private static PageData sendDeleteHttpRequest(String url,Long camIds, String token) throws IOException {
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
//将要删除的Id列表转换为逗号分隔的字符串 //将要删除的Id列表转换为逗号分隔的字符串
String joinedIds = String.join(",", camIds);
//构建完整的url //构建完整的url
url = url + "/" + joinedIds; url = url + "/" + camIds;
Request.Builder builderBuilder = new Request.Builder() Request.Builder builderBuilder = new Request.Builder()
.url(url) .url(url)
@ -370,7 +321,15 @@ public class PLSUtil {
} }
Request request = builderBuilder.build(); Request request = builderBuilder.build();
Response execute = client.newCall(request).execute();
return client.newCall(request).execute(); if (execute.code() != 200) {
logger.error("post请求失败，返回状态码：{},url:{}", execute.code(), url);
throw new RuntimeException("get请求失败");
}
PageData pageData = JSONObject.parseObject(execute.body().string(), PageData.class);
if (!"200".equals(pageData.getString("code"))) {
logger.error("post请求失败，返回值：{},url:{}", pageData.getString("msg"), url);
}
return pageData;
} }
} }

1
src/main/java/com/zcloud/util/RegexPatterns.java
View File

@ -23,6 +23,7 @@ public class RegexPatterns {
* 验证码正则, 6位数字或字母 * 验证码正则, 6位数字或字母
*/ */
public static final String VERIFY_CODE_REGEX = "^[a-zA-Z\\d]{6}$"; public static final String VERIFY_CODE_REGEX = "^[a-zA-Z\\d]{6}$";
public static final String VERIFY_CARDNO_REGEX = "^[0-9]{4}$";
/** /**
* 身份证号正则, 15位或者18位，最后一位可以为字母 * 身份证号正则, 15位或者18位，最后一位可以为字母
*/ */

146
src/main/java/com/zcloud/util/ReturnMap.java Normal file
View File

@ -0,0 +1,146 @@
package com.zcloud.util;
/**
* 说明：TODO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
import com.zcloud.util.examUntil.CodeMessageEnum;
import org.apache.http.HttpStatus;
import java.util.HashMap;
import java.util.Map;
/**
* @description: R类
**/
public class ReturnMap extends HashMap<String, Object> {
/**
* 序列ID
*/
private static final long serialVersionUID = 1L;
/**
* R的无参构造, 初始化信息
*/
public ReturnMap() {
put("code", 0);
put("msg", "success");
put("result", "success");
}
/**
* error1: 返回默认error
*
* @return 返回默认error
*/
public static ReturnMap error() {
return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常, 请联系管理员");
}
/**
* error2
*
* @param msg 错误信息
* @return 返回自定义信息的error
*/
public static ReturnMap error(String msg) {
return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
}
public static ReturnMap error(CodeMessageEnum codeMessageEnum, String uri) {
return error(codeMessageEnum.getCode(), codeMessageEnum.getMessage(), uri);
}
/**
* 原先R的code和msg被覆盖
*
* @param code 错误码
* @param msg 错误信息
* @return 自定义的错误码和错误信息
*/
public static ReturnMap error(int code, String msg) {
ReturnMap r = new ReturnMap();
r.put("code", code);
r.put("result", "error");
r.put("msg", msg);
return r;
}
public static ReturnMap error(String code, String msg) {
ReturnMap r = new ReturnMap();
r.put("code", code);
r.put("result", "error");
r.put("msg", msg);
return r;
}
public static ReturnMap error(String code, String msg, String uri) {
ReturnMap r = new ReturnMap();
r.put("code", code);
r.put("result", "error");
r.put("msg", msg);
r.put("uri", uri);
return r;
}
/**
* ok1
* 加入了msg
*
* @param msg
* @return
*/
public static ReturnMap ok(String msg) {
ReturnMap r = new ReturnMap();
r.put("msg", msg);
return r;
}
/**
* ok2: 加入了map
*
* @param map
* @return
*/
public static ReturnMap ok(Map<String, Object> map) {
ReturnMap r = new ReturnMap();
r.putAll(map);
return r;
}
/**
* ok3: 直接返回"0", "success"
*
* @return
*/
public static ReturnMap ok() {
return new ReturnMap();
}
/**
* 放入自定义的key和value, 然后返回
*
* @param key
* @param value
* @return
*/
@Override
public ReturnMap put(String key, Object value) {
super.put(key, value);
return this;
}
/**
* 得到这个对象的code
*
* @return
*/
public Integer getCode() {
return (Integer) this.get("code");
}
}

18
src/main/java/com/zcloud/util/examUntil/BaseResultInterface.java Normal file
View File

@ -0,0 +1,18 @@
package com.zcloud.util.examUntil;
/**
* 说明：TODO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
/**
* @desc 对象返回到前端以及异常抛出的接口类
*/
public interface BaseResultInterface {
String getCode();
String getMessage();
}

84
src/main/java/com/zcloud/util/examUntil/BizException.java Normal file
View File

@ -0,0 +1,84 @@
package com.zcloud.util.examUntil;
/**
* 说明：TODO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
public class BizException extends RuntimeException implements BaseResultInterface {
private static final long serialVersionUID = 1L;
/**
* 错误码
*/
private String code;
/**
* 错误信息
*/
private String message;
public BizException() {
super();
}
public BizException(CodeMessageEnum codeMessageEnum) {
super(codeMessageEnum.getCode(),new Throwable());
this.code = codeMessageEnum.getCode();
this.message = codeMessageEnum.getMessage();
}
public BizException(CodeMessageEnum codeMessageEnum, Throwable cause) {
super(codeMessageEnum.getCode(), cause);
this.code = codeMessageEnum.getCode();
this.message = codeMessageEnum.getMessage();
}
public BizException (CodeMessageEnum codeMessageEnum, Throwable cause,String details) {
super(codeMessageEnum.getCode(), cause);
this.code = codeMessageEnum.getCode();
this.message = codeMessageEnum.getMessage() + details;
}
public BizException(CodeMessageEnum codeMessageEnum, String message, Throwable cause) {
super(codeMessageEnum.getCode(), cause);
this.code = codeMessageEnum.getCode();
this.message = message;
}
public BizException(String message) {
super(message);
this.message = message;
}
public BizException(String code, String message) {
super(code);
this.code = code;
this.message = message;
}
public BizException(String code, String message, Throwable cause) {
super(code, cause);
this.code = code;
this.message = message;
}
@Override
public Throwable fillInStackTrace() {
return this;
}
@Override
public String getCode() {
return this.code;
}
@Override
public String getMessage() {
return this.message;
}
}

197
src/main/java/com/zcloud/util/examUntil/CodeMessageEnum.java Normal file
View File

@ -0,0 +1,197 @@
package com.zcloud.util.examUntil;
/**
* 说明：TODO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
public enum CodeMessageEnum implements BaseResultInterface {
/** ********* 0000成功 *************** */
SUCCESS("0000", "成功!"),
SUCCESS_LOGIN("0001", "用户登录成功"),
SUCCESS_LOGOUT("0002", "用户退出成功"),
/* 默认失败 */
COMMON_FAIL("999", "失败"),
/** ********* 1xxx系统错误 *************** */
SERVER_BUSY("1001", "服务器正忙，请稍后再试!"),
INTERNAL_SERVER_ERROR("1002", "服务器内部错误"),
NOT_FOUND("1003", "未找到该资源!"),
REQUEST_METHOD_ERROR("1004", "接口请求方法异常"),
SQL_SYNTAX_ERROR_EXCEPTION("1005", "SQL语法错误异常"),
NULL_POINT_ERROR_EXCEPTION("1006", "空指针异常信息"),
INNER_FRAME_EXCEPTION("1007", "内部框架执行异常"),
PARSE_TOKEN_EXCEPTION("1008", "解析token异常"),
TOKEN_NOT_EXIST("1009", "token不存在"),
TOKEN_SIGNATURE_EXCEPTION("1010", "token签名异常"),
TOKEN_EXPIRE("1011", "token过期，请重新登录"),
IMG_TYPE_NOT_CONFIG("1012", "请配置图片类型"),
NOT_CONFIG_FILE_DIR("1013", "请配置文件路径"),
UPLOAD_FILE_ERROR("1014", "文件上传失败"),
FILE_NOT_EXIST("1015", "文件不存在"),
FILE_HAS_DELETED("1016", "文件已被删除"),
DRIVER_CLASS_NOT_FOUND("1017", "数据库的连接驱动正在加载中..."),
TRY_CONNECT_DATABASE_ERROR("1018", "尝试连接数据库失败"),
CLOSE_CONNECT_DATABASE_ERROR("1019", "关闭数据库连接失败"),
DATABASE_NAME_NOT_EXIST("1020", "数据库名称不存在"),
CLOSE_DATASOURCE_ERROR("1021", "释放数据库资源异常"),
DRUID_DATASOURCE_ERROR("1022", "数据源创建中..."),
CREATE_DATABASE_ERROR("1023", "创建数据库失败"),
CREATE_TABLE_ERROR("1024", "创建表失败"),
UPDATE_TABLE_FIELD_ERROR("1025", "更新表字段失败"),
DELETE_TABLE_FIELD_ERROR("1026", "删除表字段失败"),
QUERY_ROLE_ERROR("1027", "查询角色失败"),
UPDATE_GROUP_ERROR("1028", "更新接口组失败"),
DELETE_GROUP_ERROR("1029", "删除接口组失败"),
SAVE_INTERFACE_ERROR("1030", "保存接口信息失败"),
/**
* ******2xxx参数错误 *********************
*/
BODY_NOT_MATCH("2001", "请求的数据格式不符"),
SIGNATURE_NOT_MATCH("2002", "请求的数字签名不匹配!"),
REQUEST_PATH_NOT_MATCH("2003", "当前请求路径没有权限!"),
NOT_UPLOAD_FILE_NAME_ERROR("2004", "上传的文件名不存在，请重新上传"),
NOT_SUPPORT_IMG_TYPE("2005", "图片格式不正确，请重新上传"),
NOT_SUPPORT_USERNAME_TYPE("2006", "excel用户名不能为空"),
NOT_SUPPORT_ROLE_TYPE("2007", "角色不存在"),
NOT_SUPPORT_DEPT_TYPE("2008", "部门不存在"),
SQL_INJECT_NOT_ALLOWED("2009", "参数中存在数据库关键字，请修改"),
TABLE_FIELD_NOT_EXIST("2010", "表字段不存在"),
FILE_PICTURE_IS_NULL("2011", "附件不存在"),
FILE_PICTURE_DELETE("2012", "删除附件失败"),
DIC_BIANMA_REPEAT("2013", "字典编码重复"),
/** *********** 3xxx用户错误 ******************* */
USER_NOT_LOGIN("3001", "用户未登录"),
USER_ACCOUNT_EXPIRED("3002", "账号已过期"),
USER_CREDENTIALS_ERROR("3003", "用户名或密码错误"),
USER_CREDENTIALS_EXPIRED("3004", "密码过期"),
USER_ACCOUNT_NOT_BIND_ENTERPRISE("3005", "当前账号未绑定企业"),
USER_ACCOUNT_LOCKED("3006", "账号被锁定"),
USER_ACCOUNT_NOT_EXIST("3007", "账号不存在"),
USER_ACCOUNT_ALREADY_EXIST("3008", "账号已存在"),
USER_ACCOUNT_USE_BY_OTHERS("3009", "账号下线"),
USER_NO_PERMISSION("3010", "当前账号没有此权限"),
USERNAME_NOT_BLANK("3011", "用户不能为空"),
USER_LOGIN_ERROR("3012", "用户登录失败"),
USER_LOGOUT_ERROR("3013", "用户退出失败"),
USER_ACCOUNT_USE_BY_OTHERS_ERROR("3014", "账号下线异常"),
USER_ACCESS_DENIED("3015", "权限认证失败"),
USERNAME_EXIST_ERROR("3016", "用户名重名"),
ROLE_NAME_ALREADY_EXIST("3101", "角色已存在"),
/** ********** 4xxx业务错误 *********************** */
ENTERPRISE_NOT_EXIST("4001", "当前企业不存在"),
APP_KEY_EXIST("4002", "应用key已存在"),
APP_NOT_EXIST("4003", "应用不存在"),
APP_PAGE_NAME_EXIST("4004", "当前页面名称已存在"),
APP_PAGE_KEY_EXIST("4005", "当前页面key已存在"),
APP_PAGE_NOT_EXIST("4006", "当前页面不存在，或已删除"),
APP_PAGE_TYPE_ERROR("4007", "页面类型有误"),
APP_PAGE_HOME_IS_NOT_EXIST("4008", "请设置首页"),
CAN_NOT_DELETE_HOME_PAGE("4009", "请勿删除首页"),
DELETE_PAGE_ERROR("4010", "删除页面失败"),
CONFIG_CUSTOM_ERROR("4011", "配置自定义页面失败"),
APP_PAGE_PARENT_NOT_EXIST("4012", "当前页面的父级页面不存在，或已删除"),
DATASOURCE_NAME_EXIST("4013", "当前数据源名称已经存在，请修改后重试"),
DATASOURCE_NOT_EXIST("4014", "当前数据源不存在"),
DATASOURCE_HAS_DELETED("4015", "当前数据源已删除"),
MODEL_NOT_EXIST("4016", "当前模型不存在"),
MODEL_HAS_DELETED("4017", "当前模型已删除"),
MODEL_NAME_HAS_EXIST("4018", "当前模型名称已存在"),
DATASOURCE_NOT_CONFIG("4019", "数据源配置为空，请联系管理员"),
DATASOURCE_NOT_CONFIG_DIALECT("4020", "未配置数据源的类型"),
DATASOURCE_NOT_CONFIG_DRIVER_CLASS_NAME("4021", "未配置数据源的驱动"),
DEPT_USER_EXIST("4022", "部门下存在用户"),
NOT_CONFIG_PAGE_BUTTON_TYPE("4023", "未配置按钮雷星"),
MODEL_PAGE_RELATION_MODEL("4024", "已关联当前模型页面"),
MODEL_PAGE_NOT_EXIST("4025", "模型页面不存在或已被删除"),
MODEL_HAS_RELATION_MODEL_PAGE("4026", "当前模型已关联模型页面，不允许删除"),
FORM_NOT_EXIST("4027", "模型表单不存在"),
READ_FILE_ERROR("4028", "读取模型页面的模板文件失败"),
MODEL_PAGE_CONTENT_NULL("4029", "未配置模型页面的模板文件"),
NOT_CONFIG_QUERY_SQL("4030", "未配置查询语句"),
APP_PAGE_BUTTON_OPTION_VALUE_ERROR("4031", "未配置接口"),
DELETE_COLUMN_ERROR("4032", "删除当前失败"),
INSERT_DATA_ERROR("4033", "新建数据失败"),
EDIT_DATA_ERROR("4034", "编辑数据失败"),
DATASOURCE_HAS_MODELS("4035", "当前数据源存在模型，不允许删除"),
NOT_CONFIG_FORM_API("4036", "未配置模型表单页的接口信息"),
PLEASE_WRITE_AT_LEAST_DATA("4037", "请至少填写一行数据"),
AMIS_PAGE_ERROR("4038", "分页参数异常"),
QUERY_APP_PAGE_QUERY_FIELD_ERROR("4039", "查询搜素参数异常"),
REQUEST_PARAM_NOT_IN_APP_PAGE_QUERY_FIELD("4040", "请求参数不在查询数据表中"),
STYLE_LANGUAGE_ON_CSS("4041", "自定义css中的样式语言不能为空"),
APP_CONFIG_TYPE_NOT_EXIST("4042", "不支持当前应用设置的类型"),
APP_CONFIG_NOT_EXIST_OR_DELETED("4043", "当前设置不存在或已被删除"),
APP_HAS_CONFIG_ON_THIS_TYPE("4044", "当前应用设置的类型已存在，请更新"),
NOT_SUPPORT_COMPONENT_FRAME("4045", "不支持当前组件框架"),
NOT_SUPPORT_COMPONENT_TYPE("4046", "不支持当前组件类型"),
CURRENT_APP_KEY_EXIST("4047", "当前应用的组件key已存在"),
CREATE_CUSTOM_COMPONENT_ERROR("4048", "新增自定义组件失败"),
APP_CUSTOM_COMPONENT_NOT_EXIST("4049", "当前组件不存在或已被删除"),
UPDATE_CUSTOM_COMPONENT_ERROR("4050", "更新自定义组件失败"),
DELETED_CUSTOM_COMPONENT_ERROR("4051", "删除自定义组件失败"),
INSERT_COMPONENT_DEPENDENCE_ERROR("4052", "新增自定义组件依赖项失败"),
DELETE_COMPONENT_DEPENDENCE_ERROR("4053", "删除自定义组件依赖项失败"),
CURRENT_COMPONENT_DEPENDENCE_NOT_EXIST("4054", "当前自定义组件依赖项不存在或已被删除"),
CURRENT_APP_NAME_EXIST("4055", "当前应用的组件名称已存在"),
NOT_SUPPORT_DATASOURCE_FROM("4056", "不支持当前的数据库来源"),
JDBC_CONFIG_ERROR("4057", "平台内置的数据源配置有误"),
NOT_SUPPORT_MODEL_TYPE("4058", "不支持当前的页面模板"),
NOT_SUPPORT_CUSTOM_PAGE("4059", "暂不支持自定义页面"),
FORM_PAGE_ON_DEVELOPING("4060", "自定义页面的该功能正在开发中..."),
APP_PAGE_QUERY_FIELD_NOT_EXIST("4061", "当前查询条件不存在，或已被删除"),
APP_PAGE_BUTTON_NOT_EXIST("4062", "当前页面按钮不存在，或已被删除"),
TABLE_KEY_MORE_THEN_ONE("4063", "主键超过一个"),
TABLE_KEY_LESS_THEN_ONE("4064", "主键必须存在"),
TABLE_KEY_MUST_BE_INT("4065", "主键必须为整数类型"),
TABLE_FIELD_MUST_EXIST("4066", "必须存在表字段"),
CURRENT_MODEL_PAGE_HAS_CONVERSION_CUSTOM_PAGE("4067", "当前模型页面已转成自定义页面"),
NOT_SUPPORT_RELEASE_STATUS("4068", "发布版本状态有误"),
APP_FORM_BUTTON_NOT_EXIST("4067", "当前表单按钮不存在，或已被删除"),
DATASOURCE_KEY_EXIST_ERROR("4068","数据源key已存在")
;
CodeMessageEnum(String code, String message) {
this.code = code;
this.message = message;
}
/** 返回到前端的code值 */
private String code;
/** 返回到前端的code对应的message值 */
private String message;
@Override
public String getCode() {
return this.code;
}
@Override
public String getMessage() {
return this.message;
}
// public static CodeVo getJsonObjectByCode(String code) {
// CodeVo codeVo = new CodeVo();
// if (Tools.isEmpty(code)) {
// return codeVo;
// }
// for (CodeMessageEnum enumObj : CodeMessageEnum.values()) {
// if (enumObj.getCode().equals(code)) {
// return new CodeVo(code, enumObj.message);
// }
// }
// return codeVo;
// }
}

14
src/main/java/com/zcloud/util/examUntil/ErrorOperation.java Normal file
View File

@ -0,0 +1,14 @@
package com.zcloud.util.examUntil;
import java.lang.annotation.*;
/**
* @Description: 异常拦截接口
* @Author: dearLin
* @Date: 2023/3/8
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface ErrorOperation {
}

94
src/main/java/com/zcloud/util/examUntil/GlobalExceptionHandler.java Normal file
View File

@ -0,0 +1,94 @@
package com.zcloud.util.examUntil;
/**
* 说明：TODO
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
import com.zcloud.util.ReturnMap;
import org.mybatis.spring.MyBatisSystemException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import javax.servlet.http.HttpServletRequest;
import static com.zcloud.util.examUntil.CodeMessageEnum.SERVER_BUSY;
/**
* 全局异常
*/
@RestControllerAdvice(annotations = {ErrorOperation.class})
//@Slf4j
public class GlobalExceptionHandler {
/**
* 业务异常类
*
*/
@ExceptionHandler(value = BizException.class)
@ResponseBody
public ReturnMap bizExceptionHandler(HttpServletRequest req, BizException e) {
e.printStackTrace();
// log.error("发生业务异常: {}, 请求接口: {}", e.getMessage(), req.getRequestURI());
return ReturnMap.error("2001" ,e.getMessage(), req.getRequestURI());
}
/**
* 空指针异常
*
* @param e 异常信息
* @param req 请求
*/
@ExceptionHandler(value = NullPointerException.class)
@ResponseBody
public ReturnMap exceptionHandler(HttpServletRequest req, NullPointerException e) {
e.printStackTrace();
// log.error("空指针异常信息: {}, 请求接口: {}", e, req.getRequestURI());
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
}
/**
* 接口请求方法异常
*
*/
@ExceptionHandler(value = HttpRequestMethodNotSupportedException.class)
@ResponseBody
public ReturnMap methodNotSupportedExceptionHandler(HttpServletRequest req, Exception e) {
e.printStackTrace();
// log.error("请求方法异常信息: {}，请求接口: {}", e, req.getRequestURI());
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
}
/**
* SQL 语法错误异常
*/
@ExceptionHandler(value = MyBatisSystemException.class)
@ResponseBody
public ReturnMap sqlSyntaxErrorExceptionHandler(HttpServletRequest req, Exception e) {
e.printStackTrace();
// log.error("MyBatis系统异常信息: {}，请求接口: {}", e, req.getRequestURI());
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
}
/**
* 其他异常信息
*
* @param req
* @param e
*/
@ExceptionHandler(value = Exception.class)
@ResponseBody
public ReturnMap exceptionHandler(HttpServletRequest req, Exception e) {
e.printStackTrace();
// log.error("未知异常: {}, 请求接口: {}", e, req.getRequestURI());
return ReturnMap.error(SERVER_BUSY, req.getRequestURI());
}
}

54
src/main/java/com/zcloud/util/examUntil/HttpContextUtils.java Normal file
View File

@ -0,0 +1,54 @@
package com.zcloud.util.examUntil;
import org.apache.commons.lang.StringUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
/**
* 说明：获取请求参数工具类
* 作者：wangxuan
* 官网：www.zcloudchina.com
*/
public class HttpContextUtils {
public static HttpServletRequest getHttpServletRequest() {
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
if(requestAttributes == null){
return null;
}
return ((ServletRequestAttributes) requestAttributes).getRequest();
}
public static Map<String, String> getParameterMap(HttpServletRequest request) {
Enumeration<String> parameters = request.getParameterNames();
Map<String, String> params = new HashMap<>();
while (parameters.hasMoreElements()) {
String parameter = parameters.nextElement();
String value = request.getParameter(parameter);
if (StringUtils.isNotBlank(value)) {
params.put(parameter, value);
}
}
return params;
}
public static String getDomain(){
HttpServletRequest request = getHttpServletRequest();
StringBuffer url = request.getRequestURL();
return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
}
public static String getOrigin(){
HttpServletRequest request = getHttpServletRequest();
return request.getHeader(HttpHeaders.ORIGIN);
}
}

19
src/main/java/com/zcloud/util/examUntil/RestTemplateConfig.java Normal file
View File

@ -0,0 +1,19 @@
package com.zcloud.util.examUntil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestTemplateConfig {
//启动时需要实例化该类的一个实例
@Autowired
private RestTemplateBuilder builder;
//使用RestTemplateBuilder来实例化RestTemplate对象,Spring已经默认注入了RestTemplateBuilder实例
@Bean
public RestTemplate restTemplate(){
return builder.build();
}
}

99
src/main/java/com/zcloud/util/examUntil/UserChangeRecordConfig.java Normal file
View File

@ -0,0 +1,99 @@
package com.zcloud.util.examUntil;
import com.alibaba.fastjson.JSON;
import com.zcloud.entity.PageData;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.UuidUtil;
import java.util.Date;
import java.util.List;
/**
* @Description: TODO
* @Author: dearLin
* @Date: 2023/8/17/017 15:10
* @Param:
* @Return:
*/
public class UserChangeRecordConfig {
public static final String PC = "pc端";
public static final String APP = "app端";
public static final String APP_EDIT_BASE_INFO = "app端修改用户基础信息";
public static final String APP_EDIT_CORP_BASE_INFO = "app端修改用户就职信息";
public static final String PC_EDIT_BASE_INFO = "pc端修改用户基础信息";
public static final String PC_IMPROT_USER_BASE_INFO = "pc端导入用户信息";
public static final String PC_EDIT_CORP_BASE_INFO = "pc端修改用户就职信息";
public static final String PC_DEL_CORP_BASE_INFO = "pc端解除用户服务信息";
public static final String PC_IMPROT_USER_BASE_img = "img端导入用户信息";
/**
* @Description: 修改信息
* @Author: dearLin
* @Date: 2023/8/17/017 15:47
* @Param: [java.util.List<com.zcloud.entity.PageData>, com.zcloud.entity.PageData] [logUserList, user]
* @Return: java.util.List<com.zcloud.entity.PageData>
*/
public static List<PageData> editUserLogPc(List<PageData> logUserList, PageData user) {
user.put("CREATTIME", DateUtil.date2Str(new Date()));
user.put("CHANGE_RECORD_ID", UuidUtil.get32UUID());
user.put("CHANGE_DATA", JSON.toJSONString(user));
user.put("CREATOR", Jurisdiction.getUSER_ID());
user.put("CREATOR_NAME", Jurisdiction.getUsername());
logUserList.add(user);
return logUserList;
}
/**
* @Description: 导入用户信息
* @Author: dearLin
* @Date: 2023/8/17/017 15:47
* @Param: [java.util.List<com.zcloud.entity.PageData>, com.zcloud.entity.PageData] [logUserList, user]
* @Return: java.util.List<com.zcloud.entity.PageData>
*/
public static void importUserLogPc(PageData user) {
user.put("CREATTIME", DateUtil.date2Str(new Date()));
user.put("CHANGE_RECORD_ID", UuidUtil.get32UUID());
user.put("CHANGE_DATA", JSON.toJSONString(user));
user.put("CREATOR", Jurisdiction.getUSER_ID());
user.put("CREATOR_NAME", Jurisdiction.getUsername());
user.put("REAMKE", "人员被" + Jurisdiction.getUsername() + "导入,就职于：" + user.getString("CORPINFO_NAME") + "。部门：" + user.getString("DEPARTMENT_NAME"));
}
/**
* @Description: 导入修改用户信息
* @Author: dearLin
* @Date: 2023/8/17/017 15:47
* @Param: [java.util.List<com.zcloud.entity.PageData>, com.zcloud.entity.PageData] [logUserList, user]
* @Return: java.util.List<com.zcloud.entity.PageData>
*/
public static void importEditUserLogPc(PageData user) {
user.put("CREATTIME", DateUtil.date2Str(new Date()));
user.put("CHANGE_RECORD_ID", UuidUtil.get32UUID());
user.put("CHANGE_DATA", JSON.toJSONString(user));
user.put("CREATOR", Jurisdiction.getUSER_ID());
user.put("CREATOR_NAME", Jurisdiction.getUsername());
user.put("REAMKE", "人员被" + Jurisdiction.getUsername() + "导入更新,就职于：" + user.getString("CORPINFO_NAME") + "。部门：" + user.getString("DEPARTMENT_NAME"));
}
/**
* @Description: 解除服务关系
* @Author: dearLin
* @Date: 2023/8/17/017 15:47
* @Param: [java.util.List<com.zcloud.entity.PageData>, com.zcloud.entity.PageData] [logUserList, user]
* @Return: java.util.List<com.zcloud.entity.PageData>
*/
public static List<PageData> clearRelation(List<PageData> logUserList, PageData user) {
user.put("CREATTIME", DateUtil.date2Str(new Date()));
user.put("CHANGE_RECORD_ID", UuidUtil.get32UUID());
user.put("CHANGE_DATA", JSON.toJSONString(user));
user.put("CREATOR", Jurisdiction.getUSER_ID());
user.put("CREATOR_NAME", Jurisdiction.getUsername());
user.put("REAMKE", "人员被" + Jurisdiction.getUsername() + "解除服务关系,曾就职于：" + user.getString("CORPINFO_NAME") + "。部门：" + user.getString("DEPARTMENT_NAME"));
logUserList.add(user);
return logUserList;
}
}

49
src/main/resources/mybatis/datasource/risk/IdentificationPartsMapper.xml
View File

@ -14,7 +14,10 @@
<!-- 字段 --> <!-- 字段 -->
<sql id="Field"> <sql id="Field">
f.PARTSNAME, f
.
PARTSNAME
,
f.CORPINFO_ID, f.CORPINFO_ID,
f.CREATOR, f.CREATOR,
f.CREATTIME, f.CREATTIME,
@ -23,6 +26,8 @@
f.ISDELETE, f.ISDELETE,
f.LONGITUDE, f.LONGITUDE,
f.LATITUDE, f.LATITUDE,
f.ELECTRONIC_FENCE_ID,
f.ELECTRONIC_FENCE,
f.IDENTIFICATIONPARTS_ID, f.IDENTIFICATIONPARTS_ID,
f.RISK_UNIT_ID, f.RISK_UNIT_ID,
f.ISMATCHING f.ISMATCHING
@ -30,7 +35,8 @@
<!-- 字段用于新增 --> <!-- 字段用于新增 -->
<sql id="Field2"> <sql id="Field2">
PARTSNAME, PARTSNAME
,
CORPINFO_ID, CORPINFO_ID,
CREATOR, CREATOR,
CREATTIME, CREATTIME,
@ -39,6 +45,8 @@
ISDELETE, ISDELETE,
LONGITUDE, LONGITUDE,
LATITUDE, LATITUDE,
ELECTRONIC_FENCE_ID,
ELECTRONIC_FENCE,
IDENTIFICATIONPARTS_ID, IDENTIFICATIONPARTS_ID,
RISK_UNIT_ID, RISK_UNIT_ID,
ISMATCHING ISMATCHING
@ -55,6 +63,8 @@
#{ISDELETE}, #{ISDELETE},
#{LONGITUDE}, #{LONGITUDE},
#{LATITUDE}, #{LATITUDE},
#{ELECTRONIC_FENCE_ID},
#{ELECTRONIC_FENCE},
#{IDENTIFICATIONPARTS_ID}, #{IDENTIFICATIONPARTS_ID},
#{RISK_UNIT_ID}, #{RISK_UNIT_ID},
#{ISMATCHING} #{ISMATCHING}
@ -93,6 +103,8 @@
OPERATTIME = #{OPERATTIME}, OPERATTIME = #{OPERATTIME},
LONGITUDE = #{LONGITUDE}, LONGITUDE = #{LONGITUDE},
LATITUDE = #{LATITUDE}, LATITUDE = #{LATITUDE},
ELECTRONIC_FENCE_ID = #{ELECTRONIC_FENCE_ID},
ELECTRONIC_FENCE = #{ELECTRONIC_FENCE},
RISK_UNIT_ID=#{RISK_UNIT_ID}, RISK_UNIT_ID=#{RISK_UNIT_ID},
IDENTIFICATIONPARTS_ID = IDENTIFICATIONPARTS_ID IDENTIFICATIONPARTS_ID = IDENTIFICATIONPARTS_ID
where where
@ -116,7 +128,8 @@
d.NAME DEPTNAME, d.NAME DEPTNAME,
d.DEPARTMENT_ID d.DEPARTMENT_ID
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
left join oa_department d on d.DEPARTMENT_ID = un.DEPARTMENT_ID left join oa_department d on d.DEPARTMENT_ID = un.DEPARTMENT_ID
where where
@ -127,7 +140,8 @@
select select
<include refid="Field"></include> <include refid="Field"></include>
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
where 1=1 and f.ISDELETE = '0' where 1=1 and f.ISDELETE = '0'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 --> <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
@ -151,7 +165,8 @@
de.NAME as DEPT_NAME, de.NAME as DEPT_NAME,
min(r.LEVELID) LEVELID min(r.LEVELID) LEVELID
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
left join OA_DEPARTMENT de on de.DEPARTMENT_ID = un.DEPARTMENT_ID left join OA_DEPARTMENT de on de.DEPARTMENT_ID = un.DEPARTMENT_ID
@ -272,7 +287,8 @@
( (
f.PARTSNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') f.PARTSNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or or
f.RISK_UNIT_ID in ( select RISKUNIT_ID from BUS_RISKUNIT where RISKUNITNAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') ) f.RISK_UNIT_ID in ( select RISKUNIT_ID from BUS_RISKUNIT where RISKUNITNAME LIKE CONCAT(CONCAT('%',
#{pd.KEYWORDS}),'%') )
) )
</if> </if>
<if test="pd.IS_APP != null and pd.IS_APP != ''"><!-- app独占 --> <if test="pd.IS_APP != null and pd.IS_APP != ''"><!-- app独占 -->
@ -289,7 +305,8 @@
c.CORP_NAME, c.CORP_NAME,
un.RISKUNITNAME un.RISKUNITNAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
@ -316,7 +333,8 @@
c.CORP_NAME, c.CORP_NAME,
un.RISKUNITNAME un.RISKUNITNAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
where f.ISDELETE = '0' and f.IDENTIFICATIONPARTS_ID in where f.ISDELETE = '0' and f.IDENTIFICATIONPARTS_ID in
@ -349,7 +367,8 @@
c.CORP_NAME, c.CORP_NAME,
un.RISKUNITNAME un.RISKUNITNAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
@ -384,7 +403,8 @@
c.CORP_NAME, c.CORP_NAME,
un.RISKUNITNAME un.RISKUNITNAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
where f.ISDELETE = '0' where f.ISDELETE = '0'
@ -414,7 +434,8 @@
<include refid="Field"></include>, <include refid="Field"></include>,
un.RISKUNITNAME un.RISKUNITNAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include>
f
left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID left join bus_riskunit un on un.RISKUNIT_ID = f.RISK_UNIT_ID
left join bus_riskpoint r on r.IDENTIFICATION_ID = f.IDENTIFICATIONPARTS_ID left join bus_riskpoint r on r.IDENTIFICATION_ID = f.IDENTIFICATIONPARTS_ID
left join bus_list_checkitem lck on lck.RISKPOINT_ID = r.RISKPOINT_ID left join bus_list_checkitem lck on lck.RISKPOINT_ID = r.RISKPOINT_ID
@ -427,12 +448,12 @@
</if> </if>
AND lck.ISDELETE = '0' AND lck.ISDELETE = '0'
GROUP BY f.IDENTIFICATIONPARTS_ID GROUP BY f.IDENTIFICATIONPARTS_ID
order by (select o.ORDERBY from BUS_CHECKROUTE o where o.LISTMANAGER_ID = lck.LISTMANAGER_ID and o.IDENTIFICATIONPARTS_ID = f.IDENTIFICATIONPARTS_ID) order by (select o.ORDERBY from BUS_CHECKROUTE o where o.LISTMANAGER_ID = lck.LISTMANAGER_ID and
o.IDENTIFICATIONPARTS_ID = f.IDENTIFICATIONPARTS_ID)
</select> </select>
<select id="getBiCount" parameterType="pd" resultType="pd"> <select id="getBiCount" parameterType="pd" resultType="pd">
SELECT SELECT l.LEVELID,
l.LEVELID,
count(l.LEVELID) COUNT count(l.LEVELID) COUNT
FROM FROM
( (

29
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
BZ, BZ,
SKIN, SKIN,
EMAIL, EMAIL,
SEX,
NUMBER, NUMBER,
PHONE, PHONE,
ROLE_IDS, ROLE_IDS,
@ -84,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
IS_SAFETY, IS_SAFETY,
ISDELETE, ISDELETE,
ISHEAD, ISHEAD,
CARDNO,
PLS_ID,
ISLEADER ISLEADER
</sql> </sql>
@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{SKIN}, #{SKIN},
#{EMAIL}, #{EMAIL},
#{NUMBER}, #{NUMBER},
#{SEX},
#{PHONE}, #{PHONE},
#{ROLE_IDS}, #{ROLE_IDS},
#{DEPARTMENT_ID}, #{DEPARTMENT_ID},
@ -124,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{IS_SAFETY}, #{IS_SAFETY},
0, 0,
#{ISHEAD}, #{ISHEAD},
#{CARDNO},
#{PLS_ID},
#{ISLEADER} #{ISLEADER}
</sql> </sql>
@ -141,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f.SKIN, f.SKIN,
f.EMAIL, f.EMAIL,
f.NUMBER, f.NUMBER,
f.SEX,
f.PHONE, f.PHONE,
f.ROLE_IDS, f.ROLE_IDS,
f.DEPARTMENT_ID, f.DEPARTMENT_ID,
@ -160,6 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f.IS_SAFETY, f.IS_SAFETY,
f.CORPINFO_ID, f.CORPINFO_ID,
f.ISHEAD, f.ISHEAD,
f.CARDNO,
f.PLS_ID,
f.ISLEADER f.ISLEADER
</sql> </sql>
@ -266,9 +275,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ROLE_ID = #{ROLE_ID}, ROLE_ID = #{ROLE_ID},
ROLE_IDS = #{ROLE_IDS}, ROLE_IDS = #{ROLE_IDS},
BZ = #{BZ}, BZ = #{BZ},
SEX = #{SEX},
EMAIL = #{EMAIL}, EMAIL = #{EMAIL},
NUMBER = #{NUMBER}, NUMBER = #{NUMBER},
SORT = #{SORT}, SORT = #{SORT},
CARDNO = #{CARDNO},
PHONE = #{PHONE} PHONE = #{PHONE}
<if test="LEARNERCATEGORY != null and LEARNERCATEGORY != ''"> <if test="LEARNERCATEGORY != null and LEARNERCATEGORY != ''">
,LEARNERCATEGORY = #{LEARNERCATEGORY} ,LEARNERCATEGORY = #{LEARNERCATEGORY}
@ -913,7 +924,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<!-- 列出某角色下的所有用户 --> <!-- 列出某角色下的所有用户 -->
<select id="findUserNameAll" parameterType="pd" resultType="pd" > <select id="findUserNameAll" parameterType="pd" resultType="pd" >
select USERNAME select *
from from
<include refid="tableName"></include> <include refid="tableName"></include>
where ISDELETE = 0 where ISDELETE = 0
@ -1367,5 +1378,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where where
f.USER_ID = #{USER_ID} f.USER_ID = #{USER_ID}
</select> </select>
<select id="findByCardNo" resultType="com.zcloud.entity.PageData">
select
*
from
<include refid="tableName"></include>
where
CARDNO = #{CARDNO} and CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
</select>
<select id="getUserCardNoAll" resultType="com.zcloud.entity.PageData">
select
USERNAME,
CARDNO
from
<include refid="tableName"></include>
where CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0
</select>
</mapper> </mapper>