地图代码重构

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")
+@RequestMapping("/czks/map")
-public class MapController extends BaseController {
+public class CzksMapController extends BaseController {
 
     @Resource
-    private BiMapService biMapService;
+    private CzksBiMapService biMapService;
 
     @Autowired
     private VideoManagerService videomanagerService;

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")
+@RequestMapping("/czks/Eight")
-public class MapEightController extends BaseController {
+public class CzksMapEightController extends BaseController {
 
     @Autowired
-    private MapEightService mapEightService;
+    private CzksMapEightService mapEightService;
-    @Autowired
-    private RestTemplate restTemplate;
 
     /**
      * @return

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")
+@RequestMapping("/czks/map/mapPlatformelectronic")
-public class MapPlatFormElectronicController extends BaseController {
+public class CzksMapPlatFormElectronicController extends BaseController {
 //    @Autowired
 //    private PlatformelectronicService platformelectronicService;
 

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")
+@RequestMapping("/czks/ObtainDisplayData")
-public class ObtainDisplayDataController extends BaseController {
+public class CzksObtainDisplayDataController extends BaseController {
 
     @Autowired
     private RiskUnitService riskUnitService;

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")
+@RequestMapping("/czks/UserPosition")
-public class UserPositionController extends BaseController {
+public class CzksUserPositionController extends BaseController {
     @Autowired
     private UsersService usersService;
 

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<PageData> getCarRecordslistPage(Page page);
 
     List<PageData> getPeopleRecordslistPage(Page page);

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<String> getCorpinfoIds(String[] ArrayDATA_IDS);

src/main/java/com/zcloud/mapper/datasource/map/PersonLocationTokenMapper.java

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

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<PageData> getDoorWayPeopleRecords(Page page);
 

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<String> getCorpinfoIds(PageData pd);
 

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;

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;
 

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

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("人员定位第三方登录失败");

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("")) {
                 //设置参数

src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zcloud.mapper.datasource.bimap.BiMapMapper">
+<mapper namespace="com.zcloud.mapper.datasource.czksbimap.CzksBiMapMapper">
 
 
     <select id="getCarRecordslistPage" resultType="com.zcloud.entity.PageData">

src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zcloud.mapper.datasource.map.MapEightMapper">
+<mapper namespace="com.zcloud.mapper.datasource.czksbimap.CzksMapEightMapper">
 
 
 	<select id="getCorpinfoIds" parameterType="string" resultType="string" >