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

401
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,17 +64,22 @@ 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
*/ */
@RequestMapping(value="/add") @RequestMapping(value = "/add")
@RequiresPermissions("identificationparts:add") @RequiresPermissions("identificationparts:add")
@ResponseBody @ResponseBody
@Transactional @Transactional
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "新增") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "新增")
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -77,7 +88,7 @@ public class IdentificationPartsController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("RISK_UNIT_ID", pd.getString("RISK_UNIT_ID")); pd.put("RISK_UNIT_ID", pd.getString("RISK_UNIT_ID"));
List<PageData> list = identificationpartsService.listAll(pd); List<PageData> list = identificationpartsService.listAll(pd);
if(list!=null&&list.size()>0) { if (list != null && list.size() > 0) {
map.put("result", "failed"); map.put("result", "failed");
map.put("exception", "辨识部位已存在，请修改后重试"); map.put("exception", "辨识部位已存在，请修改后重试");
return map; return map;
@ -102,12 +113,12 @@ public class IdentificationPartsController extends BaseController {
String fileName = ""; //执0行上传 String fileName = ""; //执0行上传
if (null != file && !file.isEmpty()) { if (null != file && !file.isEmpty()) {
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
byte[] bytes = file.getBytes(); byte[] bytes = file.getBytes();
smb.sshSftp(file, fileName,Const.FILEPATHYHTP + ffile); smb.sshSftp(file, fileName, Const.FILEPATHYHTP + ffile);
} }
pd.put("IMGFILES_ID", this.get32UUID()); pd.put("IMGFILES_ID", this.get32UUID());
pd.put("FILEPATH", Const.FILEPATHYHTP + ffile+"/"+fileName); pd.put("FILEPATH", Const.FILEPATHYHTP + ffile + "/" + fileName);
pd.put("TYPE", 17); pd.put("TYPE", 17);
pd.put("FOREIGN_KEY", pd.get("IDENTIFICATIONPARTS_ID")); pd.put("FOREIGN_KEY", pd.get("IDENTIFICATIONPARTS_ID"));
imgFilesService.save(pd); imgFilesService.save(pd);
@ -117,15 +128,17 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**获取风险点下拉框选项 /**
* 获取风险点下拉框选项
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/getSelect") @RequestMapping(value = "/getSelect")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预控",menuServer= "风险提示",instructionsOperate = "风险告知卡",instructionsType = "获取风险点下拉框选项") @LogAnno(menuType = "双重预控", menuServer = "风险提示", instructionsOperate = "风险告知卡", instructionsType = "获取风险点下拉框选项")
public Object getPointSelect() throws Exception{ public Object getPointSelect() 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -137,22 +150,24 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**删除 /**
* 删除
*
* @param out * @param out
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/delete") @RequestMapping(value = "/delete")
@RequiresPermissions("identificationparts:del") @RequiresPermissions("identificationparts:del")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "删除") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "删除")
public Object delete() throws Exception{ public Object delete() throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CHECK_IDENTIFICATION_ID", pd.get("IDENTIFICATIONPARTS_ID")); pd.put("CHECK_IDENTIFICATION_ID", pd.get("IDENTIFICATIONPARTS_ID"));
List<PageData> list = riskpointService.listAll(pd); List<PageData> list = riskpointService.listAll(pd);
if(list!=null && list.size()>0) { if (list != null && list.size() > 0) {
// map.put("result", "failed"); //返回结果 // map.put("result", "failed"); //返回结果
map.put("msg", "该辨识部位有风险管控台账，请删除所有的风险管控台账后再删除"); map.put("msg", "该辨识部位有风险管控台账，请删除所有的风险管控台账后再删除");
return map; return map;
@ -164,17 +179,19 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**修改 /**
* 修改
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/edit") @RequestMapping(value = "/edit")
@RequiresPermissions("identificationparts:edit") @RequiresPermissions("identificationparts:edit")
@ResponseBody @ResponseBody
@Transactional @Transactional
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "修改") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "修改")
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{ public Object edit(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -191,12 +208,12 @@ public class IdentificationPartsController extends BaseController {
String fileName = ""; //执0行上传 String fileName = ""; //执0行上传
if (null != file && !file.isEmpty()) { if (null != file && !file.isEmpty()) {
fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
byte[] bytes = file.getBytes(); byte[] bytes = file.getBytes();
smb.sshSftp(file, fileName,Const.FILEPATHYHTP + ffile); smb.sshSftp(file, fileName, Const.FILEPATHYHTP + ffile);
} }
pd.put("IMGFILES_ID", this.get32UUID()); pd.put("IMGFILES_ID", this.get32UUID());
pd.put("FILEPATH", Const.FILEPATHYHTP + ffile+"/"+fileName); pd.put("FILEPATH", Const.FILEPATHYHTP + ffile + "/" + fileName);
pd.put("TYPE", 17); pd.put("TYPE", 17);
pd.put("FOREIGN_KEY", pd.get("IDENTIFICATIONPARTS_ID")); pd.put("FOREIGN_KEY", pd.get("IDENTIFICATIONPARTS_ID"));
imgFilesService.save(pd); imgFilesService.save(pd);
@ -206,38 +223,73 @@ 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
*/ */
@RequestMapping(value="/list") @RequestMapping(value = "/list")
@RequiresPermissions("identificationparts:list") @RequiresPermissions("identificationparts:list")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "列表") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "列表")
public Object list(Page page) throws Exception{ public Object list(Page page) 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 = new PageData();
PageData npd = new PageData(); PageData npd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim()); if (Tools.notEmpty(KEYWORDS)) npd.put("KEYWORDS", KEYWORDS.trim());
npd.put("ISMAIN", Jurisdiction.getIS_MAIN()); npd.put("ISMAIN", Jurisdiction.getIS_MAIN());
npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE()); npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID()); npd.put("DEPARTMENT_ID", Jurisdiction.getDEPARTMENT_ID());
npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("USER_ID",Jurisdiction.getUSER_ID()); pd.put("USER_ID", Jurisdiction.getUSER_ID());
PageData cpd = new PageData(); PageData cpd = new PageData();
cpd = usersService.findById(pd); cpd = usersService.findById(pd);
npd.put("ISLEADER", cpd.getString("ISLEADER")); npd.put("ISLEADER", cpd.getString("ISLEADER"));
if(cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")){ if (cpd.getString("ISLEADER") != null && cpd.getString("ISLEADER").equals("1")) {
String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID"); String DEPARTMENT_ID = npd.getString("DEPARTMENT_ID");
String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID); String ids = departmentService.getDEPARTMENT_IDS(DEPARTMENT_ID);
ids=npd.getString("DEPARTMENT_ID")+","+ids; //把自己部门插入进去 ids = npd.getString("DEPARTMENT_ID") + "," + ids; //把自己部门插入进去
if(ids!=null && Tools.notEmpty(ids)&& ids.lastIndexOf(",")>-1) { if (ids != null && Tools.notEmpty(ids) && ids.lastIndexOf(",") > -1) {
ids = ids.substring(0,ids.lastIndexOf(",")); ids = ids.substring(0, ids.lastIndexOf(","));
npd.put("DEPARTMENT_IDS", ids.split(",")); npd.put("DEPARTMENT_IDS", ids.split(","));
}else { } else {
npd.put("DEPARTMENT_IDS", DEPARTMENT_ID); npd.put("DEPARTMENT_IDS", DEPARTMENT_ID);
} }
} }
@ -245,8 +297,8 @@ public class IdentificationPartsController extends BaseController {
List<PageData> varList = identificationpartsService.list(page); //列出IdentificationParts列表 List<PageData> varList = identificationpartsService.list(page); //列出IdentificationParts列表
int hasJur = resourceCorpService.countByCorpId(pd); int hasJur = resourceCorpService.countByCorpId(pd);
if(varList != null && varList.size() > 0) { if (varList != null && varList.size() > 0) {
for(PageData var : varList) { for (PageData var : varList) {
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY", var.getString("IDENTIFICATIONPARTS_ID")); pd2.put("FOREIGN_KEY", var.getString("IDENTIFICATIONPARTS_ID"));
List<PageData> imgs = imgFilesService.listAll(pd2); List<PageData> imgs = imgFilesService.listAll(pd2);
@ -254,21 +306,23 @@ public class IdentificationPartsController extends BaseController {
} }
} }
map.put("varList", varList); map.put("varList", varList);
map.put("hasJur", hasJur>0?"1":"0"); map.put("hasJur", hasJur > 0 ? "1" : "0");
map.put("page", page); map.put("page", page);
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/listAll") @RequestMapping(value = "/listAll")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "列表") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "列表")
public Object listAll(Page page) throws Exception{ public Object listAll(Page page) 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -280,26 +334,28 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**列表 /**
* 列表
*
* @param page * @param page
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/listAllByIdens") @RequestMapping(value = "/listAllByIdens")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "列表") @LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "列表")
public Object listAllByIdens(Page page) throws Exception{ public Object listAllByIdens(Page page) 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String DATA_IDS = pd.getString("IDS"); String DATA_IDS = pd.getString("IDS");
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS", ArrayDATA_IDS); pd.put("ArrayDATA_IDS", ArrayDATA_IDS);
List<PageData> varList = identificationpartsService.listAllByIdens(pd); List<PageData> varList = identificationpartsService.listAllByIdens(pd);
errInfo = "success"; errInfo = "success";
map.put("varList", varList); map.put("varList", varList);
}else{ } else {
errInfo = "error"; errInfo = "error";
} }
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
@ -309,15 +365,17 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**去修改页面获取数据 /**
* 去修改页面获取数据
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEdit") @RequestMapping(value = "/goEdit")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "去修改页面获取数据") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception{ public Object goEdit() 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -325,7 +383,7 @@ public class IdentificationPartsController extends BaseController {
PageData pd2 = new PageData(); PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY", pd.getString("IDENTIFICATIONPARTS_ID")); pd2.put("FOREIGN_KEY", pd.getString("IDENTIFICATIONPARTS_ID"));
pd2.put("TYPE",pd.get("TYPE")); pd2.put("TYPE", pd.get("TYPE"));
List<PageData> imgs = imgFilesService.listAll(pd2);//营业执照图片 List<PageData> imgs = imgFilesService.listAll(pd2);//营业执照图片
map.put("pd", pd); map.put("pd", pd);
@ -334,27 +392,29 @@ public class IdentificationPartsController extends BaseController {
return map; return map;
} }
/**批量删除 /**
* 批量删除
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/deleteAll") @RequestMapping(value = "/deleteAll")
@RequiresPermissions("identificationparts:del") @RequiresPermissions("identificationparts:del")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "批量删除") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "批量删除")
public Object deleteAll() throws Exception{ public Object deleteAll() 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS"); String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
for (String id : ArrayDATA_IDS) { for (String id : ArrayDATA_IDS) {
PageData iden = new PageData(); PageData iden = new PageData();
iden.put("CHECK_IDENTIFICATION_ID", id); iden.put("CHECK_IDENTIFICATION_ID", id);
List<PageData> list = riskpointService.listAll(iden); List<PageData> list = riskpointService.listAll(iden);
if(list!=null && list.size()>0) { if (list != null && list.size() > 0) {
// map.put("result", "failed"); //返回结果 // map.put("result", "failed"); //返回结果
map.put("msg", "该辨识部位下还有风险管控台账，请先删除风险管控台账"); map.put("msg", "该辨识部位下还有风险管控台账，请先删除风险管控台账");
return map; return map;
@ -366,7 +426,7 @@ public class IdentificationPartsController extends BaseController {
} }
// identificationpartsService.deleteAll(ArrayDATA_IDS); // identificationpartsService.deleteAll(ArrayDATA_IDS);
errInfo = "success"; errInfo = "success";
}else{ } else {
errInfo = "error"; errInfo = "error";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -374,10 +434,10 @@ public class IdentificationPartsController extends BaseController {
} }
@RequestMapping(value="/resourceConfig") @RequestMapping(value = "/resourceConfig")
@ResponseBody @ResponseBody
public Object resourceConfig() throws Exception{ public Object resourceConfig() 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -385,9 +445,9 @@ public class IdentificationPartsController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
String DATA_IDS = pd.getString("DATA_IDS");// 勾选的资源库ID集合 String DATA_IDS = pd.getString("DATA_IDS");// 勾选的资源库ID集合
List<String> idList = new ArrayList<String>(); List<String> idList = new ArrayList<String>();
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(","); String ArrayDATA_IDS[] = DATA_IDS.split(",");
for(String id : ArrayDATA_IDS) { for (String id : ArrayDATA_IDS) {
idList.add(id); idList.add(id);
} }
} }
@ -395,12 +455,12 @@ public class IdentificationPartsController extends BaseController {
String riskPointCountString = riskpointService.countByCorpInfo(pd); String riskPointCountString = riskpointService.countByCorpInfo(pd);
Integer count = Integer.parseInt(riskPointCountString); Integer count = Integer.parseInt(riskPointCountString);
if(allRisk != null && allRisk.size() > 0) { if (allRisk != null && allRisk.size() > 0) {
List<String> deleteIds = new ArrayList<String>(); List<String> deleteIds = new ArrayList<String>();
for(PageData risk : allRisk) { for (PageData risk : allRisk) {
deleteIds.add(risk.get("RISKPOINTTEMPORARY_ID").toString()); deleteIds.add(risk.get("RISKPOINTTEMPORARY_ID").toString());
if("1".equals(risk.get("TYPE").toString())) { // 原有风险因素修改 if ("1".equals(risk.get("TYPE").toString())) { // 原有风险因素修改
risk.put("RISKPOINT_ID", risk.get("RES_ID")); risk.put("RISKPOINT_ID", risk.get("RES_ID"));
riskpointService.edit(risk); riskpointService.edit(risk);
// 修改冗余字段检查内容 // 修改冗余字段检查内容
@ -410,10 +470,10 @@ public class IdentificationPartsController extends BaseController {
riskcheckitemService.editByPoint(pd2); riskcheckitemService.editByPoint(pd2);
} else {// 新增风险因素 } else {// 新增风险因素
risk.put("RISKPOINT_ID", this.get32UUID()); //主键 risk.put("RISKPOINT_ID", this.get32UUID()); //主键
count ++; count++;
risk.put("SORT", count); risk.put("SORT", count);
for(int i = 0; i < idList.size(); i++) { for (int i = 0; i < idList.size(); i++) {
if(idList.get(i).equals(risk.get("RES_ID").toString())) { if (idList.get(i).equals(risk.get("RES_ID").toString())) {
idList.remove(i); idList.remove(i);
break; break;
} }
@ -432,11 +492,11 @@ public class IdentificationPartsController extends BaseController {
} }
} }
} }
if(idList != null && idList.size() > 0) { if (idList != null && idList.size() > 0) {
//查询资源库信息 //查询资源库信息
List<PageData> resList = ideRepositoryService.listAllByIds(idList.toArray(new String[idList.size()])); List<PageData> resList = ideRepositoryService.listAllByIds(idList.toArray(new String[idList.size()]));
if(resList != null && resList.size() > 0) { if (resList != null && resList.size() > 0) {
for(PageData res : resList) { for (PageData res : resList) {
res.put("RISKPOINT_ID", this.get32UUID()); //主键 res.put("RISKPOINT_ID", this.get32UUID()); //主键
res.put("RES_ID", res.get("IDEREPOSITORY_ID")); res.put("RES_ID", res.get("IDEREPOSITORY_ID"));
res.put("RISK_UNIT_ID", pd.get("RISK_UNIT_ID")); res.put("RISK_UNIT_ID", pd.get("RISK_UNIT_ID"));
@ -449,7 +509,7 @@ public class IdentificationPartsController extends BaseController {
res.put("OPERATOR", Jurisdiction.getUsername()); //修改人 res.put("OPERATOR", Jurisdiction.getUsername()); //修改人
res.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 res.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
res.put("RES_ISDELETE", "0"); res.put("RES_ISDELETE", "0");
count ++; count++;
res.put("SORT", count); res.put("SORT", count);
riskpointService.save(res); riskpointService.save(res);
PageData item = new PageData(); PageData item = new PageData();
@ -466,7 +526,7 @@ public class IdentificationPartsController extends BaseController {
} }
} }
// 若未配置过资源库，修改辨识部位状态 // 若未配置过资源库，修改辨识部位状态
if(pd.get("ISMATCHING") != null && Tools.notEmpty(pd.get("ISMATCHING").toString()) && !"1".equals(pd.get("ISMATCHING").toString())) { //修改匹配资源库状态 if (pd.get("ISMATCHING") != null && Tools.notEmpty(pd.get("ISMATCHING").toString()) && !"1".equals(pd.get("ISMATCHING").toString())) { //修改匹配资源库状态
pd.put("ISMATCHING", "1"); pd.put("ISMATCHING", "1");
pd.put("IDENTIFICATIONPARTS_ID", pd.get("IDENTIFICATION_ID")); pd.put("IDENTIFICATIONPARTS_ID", pd.get("IDENTIFICATION_ID"));
identificationpartsService.editMatching(pd); identificationpartsService.editMatching(pd);
@ -485,23 +545,25 @@ public class IdentificationPartsController extends BaseController {
} }
/**导出到excel /**
* 导出到excel
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/excel") @RequestMapping(value = "/excel")
// @RequiresPermissions("toExcel") // @RequiresPermissions("toExcel")
public ModelAndView exportExcel() throws Exception{ public ModelAndView exportExcel() throws Exception {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS"); String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){ if (Tools.notEmpty(DATA_IDS)) {
String[] ArrayDATA_IDS = DATA_IDS.split(","); String[] ArrayDATA_IDS = DATA_IDS.split(",");
pd.put("ArrayDATA_IDS",ArrayDATA_IDS); pd.put("ArrayDATA_IDS", ArrayDATA_IDS);
} }
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
Map<String,Object> dataMap = new HashMap<String,Object>(); Map<String, Object> dataMap = new HashMap<String, Object>();
List<String> titles = new ArrayList<String>(); List<String> titles = new ArrayList<String>();
titles.add("所属企业"); //2 titles.add("所属企业"); //2
titles.add("风险点（单元）"); //2 titles.add("风险点（单元）"); //2
@ -509,7 +571,7 @@ public class IdentificationPartsController extends BaseController {
dataMap.put("titles", titles); dataMap.put("titles", titles);
List<PageData> varOList = identificationpartsService.listOut(pd); List<PageData> varOList = identificationpartsService.listOut(pd);
List<PageData> varList = new ArrayList<PageData>(); List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){ for (int i = 0; i < varOList.size(); i++) {
PageData vpd = new PageData(); PageData vpd = new PageData();
vpd.put("var1", varOList.get(i).getString("CORP_NAME")); //1 vpd.put("var1", varOList.get(i).getString("CORP_NAME")); //1
vpd.put("var2", varOList.get(i).getString("RISKUNITNAME")); //2 vpd.put("var2", varOList.get(i).getString("RISKUNITNAME")); //2
@ -518,7 +580,7 @@ public class IdentificationPartsController extends BaseController {
} }
dataMap.put("varList", varList); dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView(); ObjectExcelView erv = new ObjectExcelView();
mv = new ModelAndView(erv,dataMap); mv = new ModelAndView(erv, dataMap);
return mv; return mv;
} }
@ -533,17 +595,19 @@ 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
*/ */
@RequestMapping(value="/readExcel") @RequestMapping(value = "/readExcel")
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ResponseBody @ResponseBody
@Transactional @Transactional
public Object readExcel(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ public Object readExcel(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String,String> map = new HashMap<String,String>(); Map<String, String> map = new HashMap<String, String>();
String errInfo = "success"; String errInfo = "success";
StringBuffer errorStr = new StringBuffer(); StringBuffer errorStr = new StringBuffer();
if (null != file && !file.isEmpty()) { if (null != file && !file.isEmpty()) {
@ -557,64 +621,66 @@ public class IdentificationPartsController extends BaseController {
List<PageData> saveList = new ArrayList<>(); List<PageData> saveList = new ArrayList<>();
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");
List<PageData> departAll =departmentService.listAll(pdCorpId); List<PageData> departAll = departmentService.listAll(pdCorpId);
Map<String,Object> departMapAll = new HashMap<>(); Map<String, Object> departMapAll = new HashMap<>();
for (PageData pageData : departAll) { for (PageData pageData : departAll) {
departMapAll.put(Tools.excelHandle(pageData.getString("NAME")), pageData); departMapAll.put(Tools.excelHandle(pageData.getString("NAME")), pageData);
} }
List<PageData> riskunitListAll =riskunitService.listAll(pdCorpId); List<PageData> riskunitListAll = riskunitService.listAll(pdCorpId);
Map<String, Object> riskunitMapAll = new HashMap<>(); Map<String, Object> riskunitMapAll = new HashMap<>();
for (PageData pageData : riskunitListAll) { for (PageData pageData : riskunitListAll) {
riskunitMapAll.put(pageData.getString("DEPARTMENT_ID")+ Tools.excelHandle(pageData.getString("RISKUNITNAME")), pageData); riskunitMapAll.put(pageData.getString("DEPARTMENT_ID") + Tools.excelHandle(pageData.getString("RISKUNITNAME")), pageData);
} }
List<PageData> identiListAll =identificationpartsService.listAll(pdCorpId); List<PageData> identiListAll = identificationpartsService.listAll(pdCorpId);
Map<String, Object> identiMapAll = new HashMap<>(); Map<String, Object> identiMapAll = new HashMap<>();
for (PageData pageData : identiListAll) { for (PageData pageData : identiListAll) {
identiMapAll.put(pageData.getString("RISK_UNIT_ID")+ Tools.excelHandle(pageData.getString("PARTSNAME")), pageData); identiMapAll.put(pageData.getString("RISK_UNIT_ID") + Tools.excelHandle(pageData.getString("PARTSNAME")), pageData);
} }
Map<String, Object> hasAgain = new HashMap<>(); Map<String, Object> hasAgain = new HashMap<>();
int succeeNum = 1; int succeeNum = 1;
for(PageData lpd:listPd) { for (PageData lpd : listPd) {
succeeNum++; succeeNum++;
for(int i=0;i<header.size();i++) { for (int i = 0; i < header.size(); i++) {
if(!lpd.containsKey("var"+i)) { if (!lpd.containsKey("var" + i)) {
errorStr.append("<p>第"+succeeNum+"行的\""+header.get(i)+"\"无数据</p>"); errorStr.append("<p>第" + succeeNum + "行的\"" + header.get(i) + "\"无数据</p>");
continue; continue;
} }
if(Tools.isEmpty(lpd.get("var"+i))) { if (Tools.isEmpty(lpd.get("var" + i))) {
errorStr.append("<p>第"+succeeNum+"行的\""+header.get(i)+"\"无数据</p>"); errorStr.append("<p>第" + succeeNum + "行的\"" + header.get(i) + "\"无数据</p>");
continue; continue;
} }
} }
String departVar = Tools.isEmpty(lpd.get("var0"))?"": Tools.excelHandle(lpd.get("var0")); String departVar = Tools.isEmpty(lpd.get("var0")) ? "" : Tools.excelHandle(lpd.get("var0"));
String riskNameVar = Tools.isEmpty(lpd.get("var1"))?"": Tools.excelHandle(lpd.get("var1")); String riskNameVar = Tools.isEmpty(lpd.get("var1")) ? "" : Tools.excelHandle(lpd.get("var1"));
String checkNameVar = Tools.isEmpty(lpd.get("var2"))?"": Tools.excelHandle(lpd.get("var2")); String checkNameVar = Tools.isEmpty(lpd.get("var2")) ? "" : Tools.excelHandle(lpd.get("var2"));
if(hasAgain.containsKey(departVar+riskNameVar+checkNameVar)) { if (hasAgain.containsKey(departVar + riskNameVar + checkNameVar)) {
errorStr.append("<p>第"+succeeNum+"行的"+"数据重复</p>"); errorStr.append("<p>第" + succeeNum + "行的" + "数据重复</p>");
continue; continue;
} }
hasAgain.put(departVar+riskNameVar+checkNameVar, "1"); hasAgain.put(departVar + riskNameVar + checkNameVar, "1");
if(!departMapAll.containsKey(departVar)) { if (!departMapAll.containsKey(departVar)) {
errorStr.append("<p>第"+succeeNum+"行:"+"未找到名称为\""+departVar+"\"的"+header.get(0)+"</p>"); errorStr.append("<p>第" + succeeNum + "行:" + "未找到名称为\"" + departVar + "\"的" + header.get(0) + "</p>");
continue; continue;
} }
PageData depart = (PageData) departMapAll.get(departVar); PageData depart = (PageData) departMapAll.get(departVar);
if(!riskunitMapAll.containsKey(depart.getString("DEPARTMENT_ID")+riskNameVar)) { if (!riskunitMapAll.containsKey(depart.getString("DEPARTMENT_ID") + riskNameVar)) {
errorStr.append("<p>第"+succeeNum+"行:"+"在"+departVar+"部门下未找到名称为\""+riskNameVar+"\"的"+header.get(1)+"</p>"); errorStr.append("<p>第" + succeeNum + "行:" + "在" + departVar + "部门下未找到名称为\"" + riskNameVar + "\"的" + header.get(1) + "</p>");
continue; continue;
} }
PageData risk = (PageData) riskunitMapAll.get(depart.getString("DEPARTMENT_ID")+riskNameVar); PageData risk = (PageData) riskunitMapAll.get(depart.getString("DEPARTMENT_ID") + riskNameVar);
if(identiMapAll.containsKey(risk.get("RISKUNIT_ID")+checkNameVar)) { if (identiMapAll.containsKey(risk.get("RISKUNIT_ID") + checkNameVar)) {
errorStr.append("<p>第"+succeeNum+"行:"+"发现已经存在\""+riskNameVar+"-"+checkNameVar+"\"的"+header.get(2)+"</p>"); errorStr.append("<p>第" + succeeNum + "行:" + "发现已经存在\"" + riskNameVar + "-" + checkNameVar + "\"的" + header.get(2) + "</p>");
continue; continue;
} }
// else { // else {
@ -635,22 +701,22 @@ public class IdentificationPartsController extends BaseController {
saveList.add(identificationparts); saveList.add(identificationparts);
} }
if(Tools.isEmpty(errorStr.toString())) { if (Tools.isEmpty(errorStr.toString())) {
for (PageData pageData : saveList) { for (PageData pageData : saveList) {
identificationpartsService.save(pageData); identificationpartsService.save(pageData);
} }
errorStr.append("成功导入"+saveList.size()+"条数据!"); errorStr.append("成功导入" + saveList.size() + "条数据!");
}else { } else {
errInfo = "error"; errInfo = "error";
} }
FileUtils.deleteQuietly(tempFile);//删除临时文件 FileUtils.deleteQuietly(tempFile);//删除临时文件
}else { } else {
map.put("result", "error"); //返回结果 map.put("result", "error"); //返回结果
map.put("resultStr", "Excel数据未空，请检查数据后，重新上传！"); map.put("resultStr", "Excel数据未空，请检查数据后，重新上传！");
FileUtils.deleteQuietly(tempFile);//删除临时文件 FileUtils.deleteQuietly(tempFile);//删除临时文件
return map; return map;
} }
}catch (Exception e) { } catch (Exception e) {
map.put("result", "error"); //返回结果 map.put("result", "error"); //返回结果
map.put("resultStr", e.toString()); map.put("resultStr", e.toString());
FileUtils.deleteQuietly(tempFile);//删除临时文件 FileUtils.deleteQuietly(tempFile);//删除临时文件
@ -659,19 +725,21 @@ public class IdentificationPartsController extends BaseController {
} }
map.put("result", "success"); //返回结果 map.put("result", "success"); //返回结果
map.put("resultType", errInfo); //返回message类型 map.put("resultType", errInfo); //返回message类型
map.put("isExcel","1"); //返回类型 map.put("isExcel", "1"); //返回类型
map.put("resultStr", errorStr.toString()); map.put("resultStr", errorStr.toString());
return map; return map;
} }
/**判断同一个风险点辨识部位名称是否重复 /**
* 判断同一个风险点辨识部位名称是否重复
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/hasName") @RequestMapping(value = "/hasName")
@ResponseBody @ResponseBody
public Object hasName() throws Exception{ public Object hasName() throws Exception {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -679,9 +747,9 @@ public class IdentificationPartsController extends BaseController {
PageData identificationparts = new PageData(); PageData identificationparts = new PageData();
identificationparts.put("RISKUNIT_ID", pd.getString("RISK_UNIT_ID")); identificationparts.put("RISKUNIT_ID", pd.getString("RISK_UNIT_ID"));
identificationparts.put("CHECK_NAME",pd.getString("name")); identificationparts.put("CHECK_NAME", pd.getString("name"));
List<PageData> list = identificationpartsService.listAll(identificationparts); List<PageData> list = identificationpartsService.listAll(identificationparts);
if(list.size()>0) { if (list.size() > 0) {
errInfo = "error"; errInfo = "error";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
@ -692,16 +760,17 @@ public class IdentificationPartsController extends BaseController {
/** /**
* 去修改页面获取数据 * 去修改页面获取数据
* * <p>
* 风险管控->辨识部位->匹配资源存在风险 * 风险管控->辨识部位->匹配资源存在风险
*
* @param * @param
* @throws Exception * @throws Exception
*/ */
@RequestMapping(value="/goEditRes") @RequestMapping(value = "/goEditRes")
@ResponseBody @ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "风险管控",instructionsOperate = "辨识部位",instructionsType = "获取匹配资源存在风险数据") @LogAnno(menuType = "双重预防", menuServer = "风险管控", instructionsOperate = "辨识部位", instructionsType = "获取匹配资源存在风险数据")
public Object goEditRes() throws Exception{ public Object goEditRes() 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 = new PageData();
pd = this.getPageData(); pd = this.getPageData();
@ -712,28 +781,28 @@ public class IdentificationPartsController extends BaseController {
List<String> rptResIdList = new ArrayList<String>();// 编辑资源库后，生成的临时风险因素ID集合 List<String> rptResIdList = new ArrayList<String>();// 编辑资源库后，生成的临时风险因素ID集合
// 新添加临时风险因素列表 // 新添加临时风险因素列表
List<PageData> rpTimeList = riskPointTemporaryService.listAllByTime(pd); List<PageData> rpTimeList = riskPointTemporaryService.listAllByTime(pd);
if(rpTimeList != null & rpTimeList.size() > 0) { if (rpTimeList != null & rpTimeList.size() > 0) {
for(PageData pData : rpTimeList) { for (PageData pData : rpTimeList) {
if(pData.get("ACCIDENTS_NAME") != null && Tools.notEmpty(pData.get("ACCIDENTS_NAME").toString())) { if (pData.get("ACCIDENTS_NAME") != null && Tools.notEmpty(pData.get("ACCIDENTS_NAME").toString())) {
String[] split = pData.get("ACCIDENTS_NAME").toString().split(","); String[] split = pData.get("ACCIDENTS_NAME").toString().split(",");
Set<String> accSet = new HashSet<String>(Arrays.asList(split)); Set<String> accSet = new HashSet<String>(Arrays.asList(split));
accidentSet.addAll(accSet); accidentSet.addAll(accSet);
} }
if(pData.get("LEVELID") != null && Tools.notEmpty(pData.get("LEVELID").toString())) { if (pData.get("LEVELID") != null && Tools.notEmpty(pData.get("LEVELID").toString())) {
if(levelId.compareTo(pData.get("LEVELID").toString()) < 0) {// 取最高级 if (levelId.compareTo(pData.get("LEVELID").toString()) < 0) {// 取最高级
levelId = pData.get("LEVELID").toString(); levelId = pData.get("LEVELID").toString();
} }
} }
if(pData.get("TYPE") != null && Tools.notEmpty(pData.get("TYPE").toString())) { if (pData.get("TYPE") != null && Tools.notEmpty(pData.get("TYPE").toString())) {
if("1".equals(pData.get("TYPE").toString())) {// 原数据是已存在风险因素 if ("1".equals(pData.get("TYPE").toString())) {// 原数据是已存在风险因素
rptIdList.add(pData.get("RES_ID").toString()); rptIdList.add(pData.get("RES_ID").toString());
} else if("2".equals(pData.get("TYPE").toString())) { // 原数据是资源库 } else if ("2".equals(pData.get("TYPE").toString())) { // 原数据是资源库
rptResIdList.add(pData.get("RES_ID").toString()); rptResIdList.add(pData.get("RES_ID").toString());
} }
} }
} }
} }
if(rptIdList != null && rptIdList.size() > 0) { if (rptIdList != null && rptIdList.size() > 0) {
pd.put("rptIds", rptIdList.toArray()); pd.put("rptIds", rptIdList.toArray());
} }
@ -741,20 +810,20 @@ public class IdentificationPartsController extends BaseController {
pd.put("CHECK_IDENTIFICATION_ID", pd.get("IDENTIFICATIONPARTS_ID")); pd.put("CHECK_IDENTIFICATION_ID", pd.get("IDENTIFICATIONPARTS_ID"));
List<PageData> riskPointList = riskpointService.listAllToRes(pd); List<PageData> riskPointList = riskpointService.listAllToRes(pd);
if(riskPointList != null & riskPointList.size() > 0) { if (riskPointList != null & riskPointList.size() > 0) {
for(PageData pData : riskPointList) { for (PageData pData : riskPointList) {
if(pData.get("ACCIDENTS_NAME") != null && Tools.notEmpty(pData.get("ACCIDENTS_NAME").toString())) { if (pData.get("ACCIDENTS_NAME") != null && Tools.notEmpty(pData.get("ACCIDENTS_NAME").toString())) {
String[] split = pData.get("ACCIDENTS_NAME").toString().split(","); String[] split = pData.get("ACCIDENTS_NAME").toString().split(",");
Set<String> accSet = new HashSet<String>(Arrays.asList(split)); Set<String> accSet = new HashSet<String>(Arrays.asList(split));
accidentSet.addAll(accSet); accidentSet.addAll(accSet);
} }
if(pData.get("LEVELID") != null && Tools.notEmpty(pData.get("LEVELID").toString())) { if (pData.get("LEVELID") != null && Tools.notEmpty(pData.get("LEVELID").toString())) {
if(levelId.compareTo(pData.get("LEVELID").toString()) < 0) {// 取最高级 if (levelId.compareTo(pData.get("LEVELID").toString()) < 0) {// 取最高级
levelId = pData.get("LEVELID").toString(); levelId = pData.get("LEVELID").toString();
} }
} }
// 将已经保存的资源库数据排除 // 将已经保存的资源库数据排除
if(pData.get("RES_ID") != null && Tools.notEmpty(pData.get("RES_ID").toString())) { if (pData.get("RES_ID") != null && Tools.notEmpty(pData.get("RES_ID").toString())) {
rptResIdList.add(pData.get("RES_ID").toString()); rptResIdList.add(pData.get("RES_ID").toString());
} }
} }
@ -769,17 +838,17 @@ public class IdentificationPartsController extends BaseController {
pd.put("CORP_TYPE4", corp.get("CORP_TYPE4")); pd.put("CORP_TYPE4", corp.get("CORP_TYPE4"));
//查询资源库使用状态是否为启用 //查询资源库使用状态是否为启用
int count = resourceCorpService.countByCorpId(pd); int count = resourceCorpService.countByCorpId(pd);
if(count != 0){ if (count != 0) {
// 将查询条件单拿出来 // 将查询条件单拿出来
// change by liu jun description:梦姐提的新需求：[只匹配辨识部位名称，不需匹配风险点（单元）]（禅道编号：8290） // change by liu jun description:梦姐提的新需求：[只匹配辨识部位名称，不需匹配风险点（单元）]（禅道编号：8290）
PageData condition = new PageData(); PageData condition = new PageData();
// 公司的行业类型 // 公司的行业类型
condition.put("CORP_TYPE",pd.get("CORP_TYPE")); condition.put("CORP_TYPE", pd.get("CORP_TYPE"));
condition.put("CORP_TYPE2",pd.get("CORP_TYPE2")); condition.put("CORP_TYPE2", pd.get("CORP_TYPE2"));
condition.put("CORP_TYPE3",pd.get("CORP_TYPE3")); condition.put("CORP_TYPE3", pd.get("CORP_TYPE3"));
condition.put("CORP_TYPE4",pd.get("CORP_TYPE4")); condition.put("CORP_TYPE4", pd.get("CORP_TYPE4"));
// 辨识部位 // 辨识部位
condition.put("IDENTIFICATION",pd.get("IDENTIFICATION")); condition.put("IDENTIFICATION", pd.get("IDENTIFICATION"));
List<PageData> ideResList = ideRepositoryService.listAll(condition); List<PageData> ideResList = ideRepositoryService.listAll(condition);
// add by liu jun description:根据公司的行业类型一级一级的匹配。从第四级开始匹配，如果第四级没有数据，就匹配第三级以此类推 // add by liu jun description:根据公司的行业类型一级一级的匹配。从第四级开始匹配，如果第四级没有数据，就匹配第三级以此类推
if (ideResList == null || ideResList.size() == 0) { if (ideResList == null || ideResList.size() == 0) {
@ -799,15 +868,15 @@ public class IdentificationPartsController extends BaseController {
} }
} }
// 行业类型 // 行业类型
if(ideResList != null & ideResList.size() > 0) { if (ideResList != null & ideResList.size() > 0) {
for(PageData pData : ideResList) { for (PageData pData : ideResList) {
if(pData.get("ACCIDENTS_NAME") != null && Tools.notEmpty(pData.get("ACCIDENTS_NAME").toString())) { if (pData.get("ACCIDENTS_NAME") != null && Tools.notEmpty(pData.get("ACCIDENTS_NAME").toString())) {
String[] split = pData.get("ACCIDENTS_NAME").toString().split(","); String[] split = pData.get("ACCIDENTS_NAME").toString().split(",");
Set<String> accSet = new HashSet<String>(Arrays.asList(split)); Set<String> accSet = new HashSet<String>(Arrays.asList(split));
accidentSet.addAll(accSet); accidentSet.addAll(accSet);
} }
if(pData.get("LEVELID") != null && Tools.notEmpty(pData.get("LEVELID").toString())) { if (pData.get("LEVELID") != null && Tools.notEmpty(pData.get("LEVELID").toString())) {
if(levelId.compareTo(pData.get("LEVELID").toString()) > 0) {// 取最高级 if (levelId.compareTo(pData.get("LEVELID").toString()) > 0) {// 取最高级
levelId = pData.get("LEVELID").toString(); levelId = pData.get("LEVELID").toString();
} }
} }

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

File diff suppressed because it is too large Load Diff

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);
} }

234
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,38 +47,47 @@ 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
*/ */
public PageData findById(PageData pd)throws Exception{ public PageData findById(PageData pd) throws Exception {
return usersMapper.findById(pd); return usersMapper.findById(pd);
} }
/**通 /**
* 通
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listUserAndDept (PageData pd) throws Exception{ public List<PageData> listUserAndDept(PageData pd) throws Exception {
return usersMapper.listUserAndDept(pd); return usersMapper.listUserAndDept(pd);
} }
/** 获取获取部门账号 /**
* 获取获取部门账号
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listUserbyDep(PageData pd)throws Exception{ public List<PageData> listUserbyDep(PageData pd) throws Exception {
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,70 +154,87 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.findByNumbe(pd); return usersMapper.findByNumbe(pd);
} }
/**列出某角色下的所有用户 /**
* 列出某角色下的所有用户
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAllUserByRoldId(PageData pd) throws Exception{ public List<PageData> listAllUserByRoldId(PageData pd) throws Exception {
return usersMapper.listAllUserByRoldId(pd); return usersMapper.listAllUserByRoldId(pd);
} }
/**用户列表(全部) /**
* 用户列表(全部)
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listAllUser(PageData pd)throws Exception{ public List<PageData> listAllUser(PageData pd) throws Exception {
return usersMapper.listAllUser(pd); return usersMapper.listAllUser(pd);
} }
/**查询部门下用户 /**
* 查询部门下用户
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listUserByDept(PageData pd)throws Exception{ public List<PageData> listUserByDept(PageData pd) throws Exception {
return usersMapper.listUserByDept(pd); return usersMapper.listUserByDept(pd);
} }
/**用户列表(弹窗选择用) /**
* 用户列表(弹窗选择用)
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listUsersBystaff(Page page)throws Exception{ public List<PageData> listUsersBystaff(Page page) throws Exception {
return usersMapper.userBystafflistPage(page); return usersMapper.userBystafflistPage(page);
} }
/**保存用户 /**
* 保存用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void saveUser(PageData pd)throws Exception { public void saveUser(PageData pd) throws Exception {
usersMapper.saveUser(pd); usersMapper.saveUser(pd);
} }
/**保存用户系统皮肤 /**
* 保存用户系统皮肤
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void saveSkin(PageData pd)throws Exception{ public void saveSkin(PageData pd) throws Exception {
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,45 +344,47 @@ 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("用户名已存在");
} }
} }
public void editPassword(PageData pd)throws Exception{ public void editPassword(PageData pd) throws Exception {
usersMapper.editPassword(pd); usersMapper.editPassword(pd);
} }
/**删除用户 /**
* 删除用户
*
* @param pd * @param pd
* @throws Exception * @throws Exception
*/ */
public void deleteUser(PageData pd)throws Exception{ public void deleteUser(PageData pd) throws Exception {
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,24 +449,27 @@ public class UsersServiceImpl implements UsersService {
/** /**
* 查询公司员工总数 * 查询公司员工总数
*
* @param pd * @param pd
* @return * @return
*/ */
public int getUserCount(PageData pd) throws Exception{ public int getUserCount(PageData pd) throws Exception {
return usersMapper.getUserCount(pd); return usersMapper.getUserCount(pd);
} }
/** /**
* 查询公司检查过清单的员工总数 * 查询公司检查过清单的员工总数
*
* @param pd * @param pd
* @return * @return
*/ */
public int getWorkedUserCount(PageData pd) throws Exception{ public int getWorkedUserCount(PageData pd) throws Exception {
return usersMapper.getWorkedUserCount(pd); return usersMapper.getWorkedUserCount(pd);
} }
/** /**
* 查询用户倒班周期数据 * 查询用户倒班周期数据
*
* @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,36 +523,46 @@ 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
*/ */
public PageData findUserDept(PageData pd)throws Exception{ public PageData findUserDept(PageData pd) throws Exception {
return usersMapper.findUserDept(pd); return usersMapper.findUserDept(pd);
} }
/**用户列表(本部门及所有上级部门领导负责人) /**
* 用户列表(本部门及所有上级部门领导负责人)
*
* @param pd * @param pd
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listUserLeader(PageData pd)throws Exception{ public List<PageData> listUserLeader(PageData pd) throws Exception {
List<String> deptArr = new ArrayList<>(); List<String> deptArr = new ArrayList<>();
PageData dept = departmentService.findById(pd); PageData dept = departmentService.findById(pd);
deptArr.add(dept.getString("DEPARTMENT_ID")); deptArr.add(dept.getString("DEPARTMENT_ID"));
@ -486,12 +590,14 @@ public class UsersServiceImpl implements UsersService {
} }
} }
/**获取账号及部门岗位 /**
* 获取账号及部门岗位
*
* @param page * @param page
* @return * @return
* @throws Exception * @throws Exception
*/ */
public List<PageData> listUserlistPage(Page page)throws Exception{ public List<PageData> listUserlistPage(Page page) throws Exception {
return usersMapper.listUserlistPage(page); return usersMapper.listUserlistPage(page);
} }

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);
} }

507
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,325 +9,209 @@ 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;
}
/**
* 新增员工信息
* @param pd
* @throws Exception
*/
public static void saveUser(PageData pd) throws Exception {
if (getToken(pd)) {
PageData user = usersService.findByUsername(pd);
EmployeeData employeeData = new EmployeeData();
if (user == null) {
employeeData.setName(user.getString("NAME"));
employeeData.setAvatar(user.getString("USERAVATARPREFIX") + user.getString("USERAVATARURL"));
employeeData.setCardNo(user.getString("CARDNO"));
employeeData.setSex(user.getString("SEX"));
employeeData.setPhone(user.getString("PHONE"));
}
pd = corpplsinfoService.findById(pd);
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 token;
/**
* 修改人员卡
* @param pd
* @throws Exception
*/
public static void updateUserCardInfo(PageData pd) throws Exception {
Card card = new Card();
if (getToken(pd)){
card.setCardNo(pd.getString("CARDNO"));
card.setPsnId(pd.getString("PsnId"));
card.setCardType(pd.getString("CARDTYPE"));
card.setCardStatus(pd.getString("CARDSTATUS"));
card.setRemark(pd.getString("REMARK"));
pd = corpplsinfoService.findById(pd);
String token = pd.getString("TOKEN");
String url = pd.getString("POST_URL") + "/deploy/card";
Response response = sendPutHttpRequest(url, card.toString(), token);
if (!response.isSuccessful()) {
throw new IOException("请求失败:" + response);
}
}else {
throw new Exception("无法获取有效的Token");
}
}
/**
* 根据人员卡卡号获取人员信息
* @param pd
* @return
* @throws Exception
*/
public static JSONObject cardIdGetUserInfo(PageData pd) throws Exception {
JSONObject result = null;
if (getToken(pd)){
pd = corpplsinfoService.findById(pd);
String token = pd.getString("TOKEN");
String cardId = pd.getString("CARDNO");
String url = pd.getString("POST_URL") + "/deploy/psnmgt/feign-client/getPsnInfoByCardId/" + cardId;
Response response = sendGetHttpRequest(url, null, token);
if (response.isSuccessful()){
String responseBody = response.body().string();
result = new JSONObject(responseBody.isEmpty());
}else {
throw new IOException("请求失败:" + response);
}
}else {
throw new Exception("无法获取有效的Token");
}
return result;
}
/**
* 添加摄像头
* @param pd
* @throws Exception
*/
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);
String token = pd.getString("TOKEN");
String url = pd.getString("POST_URL") + "/device/camera";
Response response = sendPostHttpRequest(url, String.valueOf(camera), token);
if (!response.isSuccessful()){
throw new IOException("请求失败:" + response);
}
}else {
throw new Exception("无法获取有效的Token");
}
}
/**
* 修改摄像头基本信息
* @param pd
* @throws Exception
*/
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");
}
} }
/** /**
* 发送post类型请求 * @Description: 查询这个人的定位卡号是否存在
* @param url * @Author: dearLin
* @param jsonPayload * @Date: 2024/1/24/024 10:00
* @param token * @Param: [com.zcloud.entity.PageData] [user]
* @return * @Return: void
* @throws IOException
*/ */
private static Response sendPostHttpRequest(String url, String jsonPayload, String token) throws IOException { public static boolean hasCardNumber(PageData user) throws Exception {
OkHttpClient client = new OkHttpClient(); // 根据 定位卡号获取对应的人
MediaType JSON = MediaType.parse("application/json; charset=utf-8"); String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
RequestBody body = RequestBody.create(JSON, jsonPayload); PageData response = sendGetHttpRequest(url, null, getToken());
Request.Builder builder = new Request.Builder() // 构建一个新的Request对象。 if (response != null) {
.url(url)// 设置请求的URL。 if (!"200".equals(response.getString("code"))) {
.post(body);// 设置请求的方法为POST，并设置请求体。 return false;
//构建请求头
if (token != null && !token.isEmpty()) {// 检查token是否存在且不为空。
builder.addHeader("Authorization", "Bearer " + token);
} }
List<PageData> dataList = JSONObject.parseArray(response.getString("data"), PageData.class);
// 构建请求 return dataList.isEmpty();
Request request = builder.build(); }
//发起请求并响应数据 return false;
return client.newCall(request).execute();
} }
/** /**
* 发送PUT类型请求 * @Description: 查询这个人的定位卡号是否存在
* @param url * @Author: dearLin
* @param jsonPayload * @Date: 2024/1/24/024 10:00
* @param token * @Param: [com.zcloud.entity.PageData] [user]
* @return * @Return: void
* @throws IOException
*/ */
private static Response sendPutHttpRequest(String url, String jsonPayload, String token)throws IOException{ public static PageData getCardNumberPeople(PageData user) throws Exception {
OkHttpClient client = new OkHttpClient(); // 根据 定位卡号获取对应的人
MediaType JSON = MediaType.parse("application/json; charset=utf-8"); String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO");
RequestBody body = RequestBody.create(JSON, jsonPayload); PageData response = sendGetHttpRequest(url, null, getToken());
Request.Builder builder = new Request.Builder() if (response != null) {
.url(url) if (!"200".equals(response.getString("code"))) {
.put(body); return null;
if (token != null && !token.isEmpty()) { }
builder.addHeader("Authorization", "Bearer " + token); List<PageData> dataList = JSONObject.parseArray(response.getString("data"), PageData.class);
return dataList.size() > 0 ? dataList.get(0) : null;
}
return null;
} }
Request request = builder.build();
return client.newCall(request).execute(); /**
* @Description: 把人新增到 人员定位系统
* @Author: dearLin
* @Date: 2024/1/24/024 10:00
* @Param: [com.zcloud.entity.PageData] [user]
* @Return: void
*/
public static boolean saveUser(PageData user) throws Exception {
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon";
JSONObject loginPayload = new JSONObject();
loginPayload.put("name", user.getString("NAME"));
loginPayload.put("cardNo", user.getString("CARDNO"));
loginPayload.put("empNo", "");
loginPayload.put("sex", "");
loginPayload.put("certType", "");
loginPayload.put("certNo", "");
loginPayload.put("office", "");
loginPayload.put("staffType", "");
loginPayload.put("phone", "");
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"));
}
/**
* @Description: 把人新增到 人员定位系统
* @Author: dearLin
* @Date: 2024/1/24/024 10:00
* @Param: [com.zcloud.entity.PageData] [user]
* @Return: void
*/
public static boolean editUser(PageData user) throws Exception {
String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById";
JSONObject loginPayload = new JSONObject();
loginPayload.put("name", user.getString("NAME"));
loginPayload.put("psnId", user.getString("PLS_ID"));
loginPayload.put("cardNo", user.getString("CARDNO"));
loginPayload.put("empNo", "");
loginPayload.put("sex", "");
loginPayload.put("certType", "");
loginPayload.put("certNo", "");
loginPayload.put("office", "");
loginPayload.put("staffType", "");
loginPayload.put("phone", "");
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"));
}
public static boolean removeUser(PageData user) throws Exception {
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 "200".equals(response.getString("code"));
} }
/** /**
* 发送get类型请求 * 发送get类型请求
*
* @param url * @param url
* @param queryParams * @param queryParams
* @param token * @param token
* @return * @return PageData
* @throws IOException * @throws IOException
*/ */
private static Response sendGetHttpRequest(String url, Map<String, String> queryParams, String token) throws IOException {
private static PageData sendGetHttpRequest(String url, Map<String, String> queryParams, String token) throws IOException {
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient();
HttpUrl.Builder httpBuilder = HttpUrl.parse(url).newBuilder(); HttpUrl.Builder httpBuilder = Objects.requireNonNull(HttpUrl.parse(url)).newBuilder();
//封装请求参数 //封装请求参数
if (queryParams != null) { if (queryParams != null) {
for (Map.Entry<String, String> param : queryParams.entrySet()) { for (Map.Entry<String, String> param : queryParams.entrySet()) {
@ -342,24 +227,90 @@ public class PLSUtil {
} }
Request request = requestBuilder.build(); Request request = requestBuilder.build();
Response execute = client.newCall(request).execute();
if (execute.code() != 200) {
logger.error("get请求失败，返回状态码：{},url:{}", execute.code(), url);
throw new RuntimeException("get请求失败");
}
return JSONObject.parseObject(execute.body().string(), PageData.class);
//发送请求并返回响应数据 //发送请求并返回响应数据
}
/**
* 发送post类型请求
*
* @param url
* @param jsonPayload
* @param token
* @return
* @throws IOException
*/
private static PageData sendPostHttpRequest(String url, String jsonPayload, String token) throws IOException {
OkHttpClient client = new OkHttpClient();
MediaType JSON = MediaType.parse("application/json; charset=utf-8");
RequestBody body = RequestBody.create(JSON, jsonPayload);
Request.Builder builder = new Request.Builder() // 构建一个新的Request对象。
.url(url)// 设置请求的URL。
.post(body);// 设置请求的方法为POST，并设置请求体。
//构建请求头
if (token != null && !token.isEmpty()) {// 检查token是否存在且不为空。
builder.addHeader("Authorization", "Bearer " + token);
}
// 构建请求
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;
//发起请求并响应数据
}
/**
* 发送PUT类型请求
*
* @param url
* @param jsonPayload
* @param token
* @return
* @throws IOException
*/
private static Response sendPutHttpRequest(String url, String jsonPayload, String token) throws IOException {
OkHttpClient client = new OkHttpClient();
MediaType JSON = MediaType.parse("application/json; charset=utf-8");
RequestBody body = RequestBody.create(JSON, jsonPayload);
Request.Builder builder = new Request.Builder()
.url(url)
.put(body);
if (token != null && !token.isEmpty()) {
builder.addHeader("Authorization", "Bearer " + token);
}
Request request = builder.build();
return client.newCall(request).execute(); 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;
}
}

61
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
@ -163,9 +178,9 @@
<if test="pd.RISK_UNIT_ID != null and pd.RISK_UNIT_ID != ''"><!-- 关键词检索 --> <if test="pd.RISK_UNIT_ID != null and pd.RISK_UNIT_ID != ''"><!-- 关键词检索 -->
and f.RISK_UNIT_ID = #{pd.RISK_UNIT_ID} and f.RISK_UNIT_ID = #{pd.RISK_UNIT_ID}
</if> </if>
<!-- <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">&lt;!&ndash; 部门 &ndash;&gt;--> <!-- <if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">&lt;!&ndash; 部门 &ndash;&gt;-->
<!-- and de.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}--> <!-- and de.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}-->
<!-- </if>--> <!-- </if>-->
<choose> <choose>
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'> <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''"> <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
@ -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,14 +403,15 @@
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'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 --> <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID = #{CORPINFO_ID} and f.CORPINFO_ID = #{CORPINFO_ID}
</if> </if>
<!-- group by un.RISKUNITNAME,f.PARTSNAME --> <!-- group by un.RISKUNITNAME,f.PARTSNAME -->
order by f.OPERATTIME desc order by f.OPERATTIME desc
</select> </select>
@ -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,17 +448,17 @@
</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
( (
SELECT SELECT
min( r.LEVELID ) LEVELID min ( r.LEVELID ) LEVELID
FROM FROM
bus_identificationparts f bus_identificationparts f
LEFT JOIN bus_riskpoint r ON f.IDENTIFICATIONPARTS_ID = r.IDENTIFICATION_ID LEFT JOIN bus_riskpoint r ON f.IDENTIFICATIONPARTS_ID = r.IDENTIFICATION_ID

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>