diff --git a/src/main/java/com/zcloud/controller/app/AppHiddenController.java b/src/main/java/com/zcloud/controller/app/AppHiddenController.java index e21ca7a..ed968a2 100644 --- a/src/main/java/com/zcloud/controller/app/AppHiddenController.java +++ b/src/main/java/com/zcloud/controller/app/AppHiddenController.java @@ -2262,6 +2262,9 @@ public class AppHiddenController extends BaseController { && pd.get("isIndex").toString().equals("1")) { pd.put("SELF_USER_ID", pd.get("SELFUSERID")); } + if ("undefined".equals(pd.getString("isIndex"))) { + pd.put("isIndex", ""); + } pd.put("ISMAIN", "0"); String DISPOSESTATE = pd.getString("DISPOSESTATE"); // 关键词检索条件 if (Tools.notEmpty(DISPOSESTATE)) { diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java index 4fa1629..9d0872f 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomHiddenController.java @@ -726,7 +726,6 @@ public class CustomHiddenController extends BaseController { if (IS_SELF != null && IS_SELF.equals("1")) pd.put("SELF_USER_ID", Jurisdiction.getUSER_ID()); } - ; // 旬 if (pd.get("IS_XUN") != null && Tools.notEmpty(pd.get("IS_XUN").toString())) { // 1-10 diff --git a/src/main/java/com/zcloud/controller/mapApi/MapController.java b/src/main/java/com/zcloud/controller/mapApi/MapController.java index 3628b57..ee944fd 100644 --- a/src/main/java/com/zcloud/controller/mapApi/MapController.java +++ b/src/main/java/com/zcloud/controller/mapApi/MapController.java @@ -73,6 +73,7 @@ public class MapController extends BaseController { public ReturnMap getAlarmTypeCount() throws Exception { return ReturnMap.ok().put("data", PLSUtil.getAlarmTypeCount(Jurisdiction.getCORPINFO_ID())); } + /** * @Description: 告警数据 来自人员定位系统 * @Author: dearLin @@ -96,6 +97,7 @@ public class MapController extends BaseController { } return returnMap; } + /** * @Description: 人员定位情况 来自人员定位系统 * @Author: dearLin @@ -118,7 +120,7 @@ public class MapController extends BaseController { @RequestMapping(value = "/getRealTimeList") @ResponseBody public ReturnMap getRealTimeList() throws Exception { - return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID())); + return ReturnMap.ok().put("data", PLSUtil.getRealTimeList(Jurisdiction.getCORPINFO_ID())); } /** @@ -129,7 +131,7 @@ public class MapController extends BaseController { @RequestMapping(value = "/getFenceList") @ResponseBody public ReturnMap getFenceList() throws Exception { - return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(),1,999999)); + return ReturnMap.ok().put("data", PLSUtil.getAreaRegionList(Jurisdiction.getCORPINFO_ID(), 1, 999999)); } /** @@ -143,6 +145,19 @@ public class MapController extends BaseController { return eightWorkService.getEightWorks(); } + /** + * @Description: 获取八项作业数 + * @Param: [] [] + * @Return: com.zcloud.util.ReturnMap + */ + @RequestMapping(value = "/getEightWorksByType") + @ResponseBody + public ReturnMap getEightWorksByType() throws Exception { + PageData pageData = this.getPageData(); + pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + return ReturnMap.ok().put("varList", eightWorkService.getEightWorksByType(pageData)); + } + /** * @Description: 获取动火作业 * @Param: [] [] @@ -187,6 +202,7 @@ public class MapController extends BaseController { PageData cameraCount = videomanagerService.getCameraTopToShow(pageData); return ReturnMap.ok().put("pd", cameraCount); } + /** * @Description: 摄像头告警数 * @Author: dearLin @@ -202,6 +218,7 @@ public class MapController extends BaseController { List cameraCount = videomanagerService.getCameraAlarmCount(pageData); return ReturnMap.ok().put("CameraAlarmCount", cameraCount); } + /** * @Description: 摄像头报警类型 * @Author: dearLin @@ -260,8 +277,8 @@ public class MapController extends BaseController { @ResponseBody public ReturnMap getCharacterTrajectories() throws Exception { PageData pageData = getPageData(); - return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(),Integer.parseInt(pageData.getString("id")), - pageData.getString("startTime"),pageData.getString("endTime"),Integer.parseInt(pageData.getString("type")))); + return ReturnMap.ok().put("data", PLSUtil.characterTrajectories(Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("id")), + pageData.getString("startTime"), pageData.getString("endTime"), Integer.parseInt(pageData.getString("type")))); } /** @@ -288,7 +305,7 @@ public class MapController extends BaseController { int year = calendar.get(Calendar.YEAR); int month = calendar.get(Calendar.MONTH) + 1; - String monthString = String.format(year+"-%02d", month); + String monthString = String.format(year + "-%02d", month); String firstDayOfMonth = String.format("%04d-%02d-01 00:00:00", year, month); calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); calendar.set(Calendar.HOUR_OF_DAY, 23); @@ -323,6 +340,7 @@ public class MapController extends BaseController { public Object getCameraList() throws Exception { return ReturnMap.ok().put("varList", videomanagerService.getCameraList(getPageData())); } + public static void main(String[] args) { List> timeArray = generateTimeArray(); for (Map monthInfo : timeArray) { diff --git a/src/main/java/com/zcloud/controller/positioning/UserCardController.java b/src/main/java/com/zcloud/controller/positioning/UserCardController.java index ff19b8b..2fc855e 100644 --- a/src/main/java/com/zcloud/controller/positioning/UserCardController.java +++ b/src/main/java/com/zcloud/controller/positioning/UserCardController.java @@ -42,7 +42,7 @@ public class UserCardController extends BaseController { ReturnMap returnMap = new ReturnMap(); page.setPd(pageData); JSONObject body = PLSUtil.getUserCardDataList( - Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("str")); + Jurisdiction.getCORPINFO_ID(), Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), pageData.getString("KEYWORDS")); if (body != null) { List list = body.getJSONArray("rows").toJavaList(JSONObject.class); returnMap.put("varList", list); diff --git a/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java index f21c815..3024383 100644 --- a/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/risk/IdentificationPartsController.java @@ -100,6 +100,10 @@ public class IdentificationPartsController extends BaseController { pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("ISMATCHING", "0"); + if (Tools.isEmpty(pd.getString("ELECTRONIC_FENCE_ID"))) { + pd.put("ELECTRONIC_FENCE_NAME", null); + pd.put("ELECTRONIC_FENCE_ID", null); + } identificationpartsService.save(pd); if (files != null && files.length > 0) { @@ -237,7 +241,7 @@ public class IdentificationPartsController extends BaseController { PageData pageData = this.getPageData(); String KEYWORDS = (String) pageData.getOrDefault("KEYWORDS", ""); - JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(),KEYWORDS,Integer.parseInt(pageData.getString("currentPage")),Integer.parseInt(pageData.getString("showCount")),0); + JSONObject body = PLSUtil.getRyRegionList(Jurisdiction.getCORPINFO_ID(), KEYWORDS, Integer.parseInt(pageData.getString("currentPage")), Integer.parseInt(pageData.getString("showCount")), 0); if (body != null) { List list = body.getJSONArray("rows").toJavaList(JSONObject.class); diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index 830d6a1..b38ddf7 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -149,7 +149,7 @@ public class LoginController extends BaseController { PageData dpd = new PageData(); dpd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); dpd = departmentService.findById(dpd); - if (dpd.getString("FOREIGNPERSONNEL").equals("1")) { + if ("1".equals(dpd.getString("FOREIGNPERSONNEL"))) { return ReturnMap.error("账号密码不正确"); } map.put("DEPARTMENT_NAME", dpd.getString("NAME")); diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 585f6c8..d2d7435 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -445,6 +445,7 @@ public class UsersController extends BaseController { String msg = usersService.changeOrUpdUserCardNo(pd); if (msg.equals(Const.CAN_CHENG_USER)) { if (PLSUtil.editUser(pd)) { + if (Tools.isEmpty(pd.getString("CARDNO"))) {pd.put("CARDNO", null);} usersService.editUser(pd); //执行修改 if ("true".equals(pd.getString("ISSTUDENT"))) { if ("select".equals(pd.getString("letDutiesType"))) { diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java index 3dc34e3..18d4cbe 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/EightWorkMapper.java @@ -16,5 +16,7 @@ public interface EightWorkMapper { List getEightWorks(PageData corp); List listAllForDiagnosis(PageData pd); + + List getEightWorksByType(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java b/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java index 09ffbc7..971dea0 100644 --- a/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java +++ b/src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java @@ -112,7 +112,6 @@ public class CorpInfoServiceImpl implements CorpInfoService { public PageData eightWorkBI(PageData pd) throws Exception{ return corpinfoMapper.eightWorkBI(pd); } - @Override public void updateEnterpriseId(PageData corpPage) { corpinfoMapper.updateEnterpriseId(corpPage); diff --git a/src/main/java/com/zcloud/service/eightwork/EightWorkService.java b/src/main/java/com/zcloud/service/eightwork/EightWorkService.java index 91f9c8f..5f3c11f 100644 --- a/src/main/java/com/zcloud/service/eightwork/EightWorkService.java +++ b/src/main/java/com/zcloud/service/eightwork/EightWorkService.java @@ -19,4 +19,6 @@ public interface EightWorkService { List list(PageData pd)throws Exception; List listAllForDiagnosis(PageData pd)throws Exception; + + List getEightWorksByType(PageData pageData); } diff --git a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java index f35b5c0..f4820c0 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/EightWorkServiceImpl.java @@ -111,4 +111,10 @@ public class EightWorkServiceImpl implements EightWorkService { return eightworkMapper.listAllForDiagnosis(pd); } + @Override + public List getEightWorksByType(PageData pageData) { + return eightworkMapper.getEightWorksByType(pageData); + + } + } diff --git a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java index 4edeeed..91b45d6 100644 --- a/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java +++ b/src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java @@ -409,7 +409,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic hidden.put("HIDDENTYPE2", lists.get(1)); //隐患类型2 hidden.put("HIDDENTYPE3", lists.get(2)); //隐患类型3 } - hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));//隐患类型名称 + hidden.put("HIDDENTYPE_NAME", StringUtils.isNotBlank(json.getString("HIDDENTYPENAME")) ? json.getString("HIDDENTYPENAME") : json.getString("HIDDENTYPE_NAME"));//隐患类型名称 hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度 hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度 hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间 diff --git a/src/main/java/com/zcloud/util/PLSUtil.java b/src/main/java/com/zcloud/util/PLSUtil.java index 420c5ca..19de32a 100644 --- a/src/main/java/com/zcloud/util/PLSUtil.java +++ b/src/main/java/com/zcloud/util/PLSUtil.java @@ -39,7 +39,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity exchange = restTemplate.exchange( - PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/deploy/card/list?sortThePowerLevel=1&pageNum=" + + getBakeAddr(CORPINFO_ID) + "/deploy/card/list?sortThePowerLevel=1&pageNum=" + currentPage + "&pageSize=" + showCount, HttpMethod.GET, httpEntity, @@ -52,7 +52,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity exchange = restTemplate.exchange( - PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, + getBakeAddr(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -77,7 +77,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); ResponseEntity exchange = restTemplate.exchange( - PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/alarm/alarmStatistics?type=day", + getBakeAddr(CORPINFO_ID) + "/region/alarm/alarmStatistics?type=day", HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -88,7 +88,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url, HttpMethod.POST, httpEntity, JSONObject.class); @@ -99,7 +99,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + id, HttpMethod.GET, httpEntity, JSONObject.class); @@ -112,7 +112,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + params, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + params, HttpMethod.GET, httpEntity, JSONObject.class); @@ -124,7 +124,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url, HttpMethod.PUT, httpEntity, JSONObject.class); @@ -135,7 +135,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + Url + id, + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + Url + id, HttpMethod.DELETE, httpEntity, JSONObject.class); @@ -158,7 +158,7 @@ public class PLSUtil { if (Tools.notEmpty(keywords)) { url = url + keywords; } - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url , HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -177,7 +177,7 @@ public class PLSUtil { // "/region/alarm/list?pageNum=" + // currentPage + "&pageSize=" + showCount +"&str=" + "&eleType="+eleType+ "&status="+status HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/alarm/list?eleType=" + eleType + "+&status=" + status + "&pageNum=" + currentPage + "&pageSize=" + showCount + "&str=" , HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -200,7 +200,7 @@ public class PLSUtil { url = url + keywords; } HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url , HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -217,7 +217,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera/list?pageNum=1&pageSize=100000&str=", HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -246,11 +246,11 @@ public class PLSUtil { uriVariables.put("alt", ""); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); // HttpEntity httpEntity = new HttpEntity<>(uriVariables,headers); -// ResponseEntity jsonObjectResponseEntity = restTemplate.postForEntity(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera", +// ResponseEntity jsonObjectResponseEntity = restTemplate.postForEntity(getBakeAddr(CORPINFO_ID) + "/device/camera", // httpEntity, JSONObject.class); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera", + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera", HttpMethod.POST, httpEntity, JSONObject.class); @@ -273,7 +273,7 @@ public class PLSUtil { uriVariables.put("camName", camera.getString("VIDEONAME")); uriVariables.put("camId", camera.getString("PLS_ID")); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera", + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera", HttpMethod.PUT, httpEntity, JSONObject.class, uriVariables); return exchange.getBody(); @@ -290,7 +290,7 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/device/camera/" + Integer.parseInt(camera.getString("PLS_ID")), HttpMethod.DELETE, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/device/camera/" + Integer.parseInt(camera.getString("PLS_ID")), HttpMethod.DELETE, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -311,7 +311,7 @@ public class PLSUtil { if (Tools.notEmpty(keywords)) url += keywords; headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + url, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -325,7 +325,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/list?pageNum=" + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/region/list?pageNum=" + currentPage + "&pageSize=" + showCount, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); @@ -341,7 +341,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/region/" + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/region/" + id, HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -355,7 +355,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/location/loca/personnelTrajectories",HttpMethod.GET, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca/personnelTrajectories",HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -375,7 +375,7 @@ public class PLSUtil { uriVariables.put("type", type); HttpEntity httpEntity = new HttpEntity<>(uriVariables, headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/location/loca/characterTrajectories", + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca/characterTrajectories", HttpMethod.POST, httpEntity, JSONObject.class); @@ -393,7 +393,7 @@ public class PLSUtil { headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/api/prod-api/coordinate/realTime/data", HttpMethod.GET, httpEntity, JSONObject.class); + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/location/loca", HttpMethod.GET, httpEntity, JSONObject.class); return exchange.getBody(); } @@ -408,21 +408,30 @@ public class PLSUtil { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" + + ResponseEntity exchange = restTemplate.exchange(getBakeAddr(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" + PLS_ID + "&id=" + ELECTRONIC_FENCE_ID, HttpMethod.GET, httpEntity, Boolean.class); return exchange.getBody(); } - @PostConstruct - private void initBakeAddr() throws Exception { - List dataList = corpplsinfoService.listAll(new PageData()); + private static void initBakeAddr(){ + List dataList = null; + try { + dataList = corpplsinfoService.listAll(new PageData()); + } catch (Exception e) { + throw new RuntimeException(e); + } dataList.forEach(item -> { BAKEADDR.put(item.getString("CORPINFO_ID"), item.getString("POST_URL")); }); } - + private static String getBakeAddr(String CORPINFO_ID) throws Exception { + return BAKEADDR.computeIfAbsent(CORPINFO_ID, key -> { + initBakeAddr(); + return BAKEADDR.get(CORPINFO_ID); + }); + } /** * @Description: 获取token * @Author: dearLin @@ -449,7 +458,7 @@ public class PLSUtil { if (response != null) { PageData valueData = JSONObject.parseObject(response.getString("data"), PageData.class); token = valueData.getString("access_token"); - String newExpireTime = DateUtil.getAfterHourDate("12"); + String newExpireTime = DateUtil.getAfterHourDate("24"); pd.put("TOKEN", token); pd.put("EXPIRE_TIME", newExpireTime); corpplsinfoService.edit(pd); @@ -472,7 +481,7 @@ public class PLSUtil { public static boolean hasCardNumber(PageData user) throws Exception { if (Tools.isEmpty(user.getString("CARDNO"))) {return true;} // 根据 定位卡号获取对应的人 - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); PageData response = sendGetHttpRequest(url, null, getToken(Jurisdiction.getCORPINFO_ID())); if (response != null) { if (!"200".equals(response.getString("code"))) { @@ -493,7 +502,7 @@ public class PLSUtil { */ public static PageData getCardNumberPeople(PageData user) throws Exception { // 根据 定位卡号获取对应的人 - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/card/peopleDisplay/" + user.getString("CARDNO"); PageData response = sendGetHttpRequest(url, null, getToken(Jurisdiction.getCORPINFO_ID())); if (response != null) { if (!"200".equals(response.getString("code"))) { @@ -513,7 +522,7 @@ public class PLSUtil { * @Return: void */ public static PageData saveUser(PageData user) throws Exception { - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon"; + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/insertPsnIfon"; JSONObject loginPayload = new JSONObject(); loginPayload.put("name", user.getString("NAME")); loginPayload.put("cardNo", user.getString("CARDNO")); @@ -555,7 +564,7 @@ public class PLSUtil { } return false; } - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById"; + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt/updPsnInfoById"; JSONObject loginPayload = new JSONObject(); loginPayload.put("name", user.getString("NAME")); loginPayload.put("psnId", user.getString("PLS_ID")); @@ -582,7 +591,7 @@ public class PLSUtil { } public static boolean removeUser(PageData user) throws Exception { - String url = BAKEADDR.get(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt"; + String url = getBakeAddr(Jurisdiction.getCORPINFO_ID()) + "/deploy/psnmgt"; PageData removeUser = usersService.findById(user); PageData response = sendDeleteHttpRequest(url, Long.parseLong(removeUser.getString("PLS_ID")), getToken(Jurisdiction.getCORPINFO_ID())); return "200".equals(response.getString("code")); diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml index ee850b3..755f332 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml @@ -87,4 +87,17 @@ union all select count(1) as count,sum(case when f.STEP_ID=15 then 1 else 0 end) as pass_count from BUS_HOTWORK f where DATE_FORMAT(f.CREATTIME,'%Y-%m')=#{MONTH} and f.CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = 0 +