From 575b27f7059deca2ccceca985bb15ca47716d7d4 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Mon, 15 Jan 2024 11:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=BB=A3=E7=A0=81=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CzksMapController.java} | 11 ++++--- .../CzksMapEightController.java} | 12 ++++---- .../CzksMapPlatFormElectronicController.java} | 13 ++------- .../CzksObtainDisplayDataController.java} | 6 ++-- .../CzksUserPositionController.java} | 6 ++-- .../CzksBiMapMapper.java} | 4 +-- .../CzksMapEightMapper.java} | 4 +-- .../map/PersonLocationTokenMapper.java | 29 ------------------- .../CzksBiMapService.java} | 4 +-- .../CzksMapEightService.java} | 4 +-- .../impl/CzksBiMapServiceImpl.java} | 10 +++---- .../impl/CzksMapEightServiceImpl.java} | 11 +++---- .../service/system/impl/UsersServiceImpl.java | 4 +-- .../{PerLocUtil.java => CzksPerLocUtil.java} | 11 +------ .../java/com/zcloud/util/HttpRequestUtil.java | 4 +-- .../CzksBiMapMapper.xml} | 2 +- .../CzksMapEightMapper.xml} | 2 +- 17 files changed, 45 insertions(+), 92 deletions(-) rename src/main/java/com/zcloud/controller/{map/MapController.java => czksmap/CzksMapController.java} (98%) rename src/main/java/com/zcloud/controller/{map/MapEightController.java => czksmap/CzksMapEightController.java} (95%) rename src/main/java/com/zcloud/controller/{map/MapPlatFormElectronicController.java => czksmap/CzksMapPlatFormElectronicController.java} (87%) rename src/main/java/com/zcloud/controller/{map/ObtainDisplayDataController.java => czksmap/CzksObtainDisplayDataController.java} (87%) rename src/main/java/com/zcloud/controller/{map/UserPositionController.java => czksmap/CzksUserPositionController.java} (92%) rename src/main/java/com/zcloud/mapper/datasource/{bimap/BiMapMapper.java => czksbimap/CzksBiMapMapper.java} (90%) rename src/main/java/com/zcloud/mapper/datasource/{map/MapEightMapper.java => czksbimap/CzksMapEightMapper.java} (98%) delete mode 100644 src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java rename src/main/java/com/zcloud/service/{bimap/BiMapService.java => czksbimap/CzksBiMapService.java} (94%) rename src/main/java/com/zcloud/service/{map/MapEightService.java => czksbimap/CzksMapEightService.java} (95%) rename src/main/java/com/zcloud/service/{bimap/impl/BiMapServiceImpl.java => czksbimap/impl/CzksBiMapServiceImpl.java} (97%) rename src/main/java/com/zcloud/service/{map/impl/MapEightServiceImpl.java => czksbimap/impl/CzksMapEightServiceImpl.java} (99%) rename src/main/java/com/zcloud/util/{PerLocUtil.java => CzksPerLocUtil.java} (89%) rename src/main/resources/mybatis/datasource/{bimap/BiMapMapper.xml => czksbimap/CzksBiMapMapper.xml} (99%) rename src/main/resources/mybatis/datasource/{bus/MapEightMapper.xml => czksbimap/CzksMapEightMapper.xml} (99%) diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java similarity index 98% rename from src/main/java/com/zcloud/controller/map/MapController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksMapController.java index e0d41387..44b5d144 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapController.java @@ -1,10 +1,10 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.bimap.BiMapService; +import com.zcloud.service.czksbimap.CzksBiMapService; import com.zcloud.service.bus.CorpInfoService; import com.zcloud.service.fireresources.FireResourcesService; import com.zcloud.service.gatemachine.GateMachineService; @@ -20,7 +20,6 @@ import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.client.RestTemplate; @@ -36,11 +35,11 @@ import java.util.Map; * 官网：www.zcloudchina.com */ @Controller -@RequestMapping("/map") -public class MapController extends BaseController { +@RequestMapping("/czks/map") +public class CzksMapController extends BaseController { @Resource - private BiMapService biMapService; + private CzksBiMapService biMapService; @Autowired private VideoManagerService videomanagerService; diff --git a/src/main/java/com/zcloud/controller/map/MapEightController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java similarity index 95% rename from src/main/java/com/zcloud/controller/map/MapEightController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java index e55d3ba1..a6957fe7 100644 --- a/src/main/java/com/zcloud/controller/map/MapEightController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java @@ -1,9 +1,9 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.map.MapEightService; +import com.zcloud.service.czksbimap.CzksMapEightService; import com.zcloud.util.Jurisdiction; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -22,13 +22,11 @@ import java.util.Map; * 官网：www.zcloudchina.com */ @Controller -@RequestMapping("/map/Eight") -public class MapEightController extends BaseController { +@RequestMapping("/czks/Eight") +public class CzksMapEightController extends BaseController { @Autowired - private MapEightService mapEightService; - @Autowired - private RestTemplate restTemplate; + private CzksMapEightService mapEightService; /** * @return diff --git a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java similarity index 87% rename from src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java index c5878205..8088ff7c 100644 --- a/src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapPlatFormElectronicController.java @@ -1,21 +1,14 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.zcloud.controller.base.BaseController; -import com.zcloud.entity.PageData; //import com.zcloud.service.keyProjects.PlatformelectronicService; //import com.zcloud.util.hk.HKPostUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; @Controller -@RequestMapping("/map/mapPlatformelectronic") -public class MapPlatFormElectronicController extends BaseController { +@RequestMapping("/czks/map/mapPlatformelectronic") +public class CzksMapPlatFormElectronicController extends BaseController { // @Autowired // private PlatformelectronicService platformelectronicService; diff --git a/src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java similarity index 87% rename from src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java index daa30af0..ec858b3d 100644 --- a/src/main/java/com/zcloud/controller/map/ObtainDisplayDataController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksObtainDisplayDataController.java @@ -1,4 +1,4 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller -@RequestMapping("/ObtainDisplayData") -public class ObtainDisplayDataController extends BaseController { +@RequestMapping("/czks/ObtainDisplayData") +public class CzksObtainDisplayDataController extends BaseController { @Autowired private RiskUnitService riskUnitService; diff --git a/src/main/java/com/zcloud/controller/map/UserPositionController.java b/src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java similarity index 92% rename from src/main/java/com/zcloud/controller/map/UserPositionController.java rename to src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java index fb79df87..f686fa8d 100644 --- a/src/main/java/com/zcloud/controller/map/UserPositionController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksUserPositionController.java @@ -1,4 +1,4 @@ -package com.zcloud.controller.map; +package com.zcloud.controller.czksmap; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.PageData; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller -@RequestMapping("/UserPosition") -public class UserPositionController extends BaseController { +@RequestMapping("/czks/UserPosition") +public class CzksUserPositionController extends BaseController { @Autowired private UsersService usersService; diff --git a/src/main/java/com/zcloud/mapper/datasource/bimap/BiMapMapper.java b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksBiMapMapper.java similarity index 90% rename from src/main/java/com/zcloud/mapper/datasource/bimap/BiMapMapper.java rename to src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksBiMapMapper.java index 08aac0da..06aa7838 100644 --- a/src/main/java/com/zcloud/mapper/datasource/bimap/BiMapMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksBiMapMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.bimap; +package com.zcloud.mapper.datasource.czksbimap; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -10,7 +10,7 @@ import java.util.List; * 作者：wangxuan * 官网：www.zcloudchina.com */ -public interface BiMapMapper { +public interface CzksBiMapMapper { List getCarRecordslistPage(Page page); List getPeopleRecordslistPage(Page page); diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java similarity index 98% rename from src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java rename to src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java index 3d00a62e..986161e6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mapper.datasource.map; +package com.zcloud.mapper.datasource.czksbimap; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -12,7 +12,7 @@ import java.util.Map; * 时间：2022-09-21 * 官网：www.zcloudchina.com */ -public interface MapEightMapper { +public interface CzksMapEightMapper { List getCorpinfoIds(String[] ArrayDATA_IDS); diff --git a/src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java deleted file mode 100644 index e13ce048..00000000 --- a/src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zcloud.mapper.datasource.map; - -import com.zcloud.entity.PageData; - -/** - * @author zhangyue - * @date 2023/9/20/020 17:41 - */ -public interface PersonLocationTokenMapper { - - /**新增 - * @param pd - * @throws Exception - */ - void save(PageData pd); - - - /**修改 - * @param pd - * @throws Exception - */ - void edit(String token); - - /** - * @throws Exception - */ - String getToken(); - -} diff --git a/src/main/java/com/zcloud/service/bimap/BiMapService.java b/src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java similarity index 94% rename from src/main/java/com/zcloud/service/bimap/BiMapService.java rename to src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java index cd641bf6..3c370ec4 100644 --- a/src/main/java/com/zcloud/service/bimap/BiMapService.java +++ b/src/main/java/com/zcloud/service/czksbimap/CzksBiMapService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.bimap; +package com.zcloud.service.czksbimap; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -12,7 +12,7 @@ import java.util.Map; * 作者：wangxuan * 官网：www.zcloudchina.com */ -public interface BiMapService { +public interface CzksBiMapService { List getDoorWayPeopleRecords(Page page); diff --git a/src/main/java/com/zcloud/service/map/MapEightService.java b/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java similarity index 95% rename from src/main/java/com/zcloud/service/map/MapEightService.java rename to src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java index 692eabb0..59982661 100644 --- a/src/main/java/com/zcloud/service/map/MapEightService.java +++ b/src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java @@ -1,4 +1,4 @@ -package com.zcloud.service.map; +package com.zcloud.service.czksbimap; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -12,7 +12,7 @@ import java.util.Map; * 时间：2022-09-21 * 官网：www.zcloudchina.com */ -public interface MapEightService { +public interface CzksMapEightService { List getCorpinfoIds(PageData pd); diff --git a/src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java b/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java similarity index 97% rename from src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java rename to src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java index 8920398d..6e507ea6 100644 --- a/src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java @@ -1,13 +1,13 @@ -package com.zcloud.service.bimap.impl; +package com.zcloud.service.czksbimap.impl; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.bimap.BiMapMapper; +import com.zcloud.mapper.datasource.czksbimap.CzksBiMapMapper; import com.zcloud.mapper.datasource.bus.CorpInfoMapper; import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper; import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper; -import com.zcloud.service.bimap.BiMapService; +import com.zcloud.service.czksbimap.CzksBiMapService; import com.zcloud.util.biMapFactory.AbsFireSourcesHandel; import com.zcloud.util.biMapFactory.AssemblyBeanFactory; import org.apache.commons.lang.StringUtils; @@ -26,10 +26,10 @@ import java.util.*; * 官网：www.zcloudchina.com */ @Service -public class BiMapServiceImpl implements BiMapService { +public class CzksBiMapServiceImpl implements CzksBiMapService { @Resource - private BiMapMapper biMapMapper; + private CzksBiMapMapper biMapMapper; @Resource private FireResourcesMapper fireResourcesMapper; diff --git a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java similarity index 99% rename from src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java rename to src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java index e56718fb..3910705e 100644 --- a/src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java +++ b/src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java @@ -1,10 +1,11 @@ -package com.zcloud.service.map.impl; +package com.zcloud.service.czksbimap.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.mapper.datasource.map.MapEightMapper; +import com.zcloud.mapper.datasource.czksbimap.CzksMapEightMapper; import com.zcloud.mapper.datasource.system.UsersMapper; -import com.zcloud.service.map.MapEightService; + +import com.zcloud.service.czksbimap.CzksMapEightService; import com.zcloud.util.Tools; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -22,10 +23,10 @@ import java.util.*; */ @Service @Transactional //开启事物 -public class MapEightServiceImpl implements MapEightService { +public class CzksMapEightServiceImpl implements CzksMapEightService { @Autowired - private MapEightMapper mapEightMapper; + private CzksMapEightMapper mapEightMapper; @Autowired private UsersMapper usersMapper; diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index bd905f76..f40dbf4f 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -9,7 +9,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zcloud.entity.system.Role; import com.zcloud.util.HttpRequestUtil; -import com.zcloud.util.PerLocUtil; +import com.zcloud.util.CzksPerLocUtil; import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,7 @@ import com.zcloud.service.system.UsersService; @Transactional //开启事物 public class UsersServiceImpl implements UsersService { @Autowired - private PerLocUtil perLocUtil; + private CzksPerLocUtil perLocUtil; @Autowired private UsersMapper usersMapper; @Value("${perLoc.url}") diff --git a/src/main/java/com/zcloud/util/PerLocUtil.java b/src/main/java/com/zcloud/util/CzksPerLocUtil.java similarity index 89% rename from src/main/java/com/zcloud/util/PerLocUtil.java rename to src/main/java/com/zcloud/util/CzksPerLocUtil.java index ed644f78..7341d147 100644 --- a/src/main/java/com/zcloud/util/PerLocUtil.java +++ b/src/main/java/com/zcloud/util/CzksPerLocUtil.java @@ -1,19 +1,15 @@ package com.zcloud.util; import com.alibaba.fastjson.JSONObject; -import com.zcloud.mapper.datasource.map.PersonLocationTokenMapper; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.Resource; - /** * 人员定位系统工具类 * @author zhangyue * @date 2023/9/20/020 17:33 */ @Component -public class PerLocUtil { +public class CzksPerLocUtil { // @Value("${perLoc.url}") // 线上地址 @@ -32,10 +28,6 @@ public class PerLocUtil { private static String perLocToken = ""; - - @Resource - private PersonLocationTokenMapper personLocationTokenMapper; - public static String getToken(){ // token 不为空。验证token是否失效 if (Tools.notEmpty(perLocToken)) { @@ -70,7 +62,6 @@ public class PerLocUtil { if(Tools.notEmpty(loginResStr) && loginResponse != null && loginResponse.get("code") != null && loginResponse.getInteger("code") == 200 && loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){ -// personLocationTokenMapper.edit(loginResponse.getJSONObject("data").getString("access_token")); return loginResponse.getJSONObject("data").getString("token"); } else { // 登录失败 throw new RuntimeException("人员定位第三方登录失败"); diff --git a/src/main/java/com/zcloud/util/HttpRequestUtil.java b/src/main/java/com/zcloud/util/HttpRequestUtil.java index 571711cf..d61e99a1 100644 --- a/src/main/java/com/zcloud/util/HttpRequestUtil.java +++ b/src/main/java/com/zcloud/util/HttpRequestUtil.java @@ -379,7 +379,7 @@ public class HttpRequestUtil { BufferedReader br = null; try { //创建连接对象 - URL url = new URL(PerLocUtil.perLocUrl + httpUrl); + URL url = new URL(CzksPerLocUtil.perLocUrl + httpUrl); //创建连接 connection = (HttpURLConnection) url.openConnection(); //设置请求方法 @@ -398,7 +398,7 @@ public class HttpRequestUtil { // connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"); connection.setRequestProperty("Content-Type", "application/json;charset=utf-8"); // 必须添加token - connection.setRequestProperty("Authorization", PerLocUtil.getToken()); + connection.setRequestProperty("Authorization", CzksPerLocUtil.getToken()); //拼装参数 if (null != param && !param.equals("")) { //设置参数 diff --git a/src/main/resources/mybatis/datasource/bimap/BiMapMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml similarity index 99% rename from src/main/resources/mybatis/datasource/bimap/BiMapMapper.xml rename to src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml index 0c6b4109..be62d84b 100644 --- a/src/main/resources/mybatis/datasource/bimap/BiMapMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml @@ -1,6 +1,6 @@ - +