修改配置

hiatmp-base/pom.xml

@@ -37,10 +37,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>

hiatmp-common/pom.xml

@@ -68,10 +68,10 @@
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
         <!-- 数据库驱动相关 -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.alibaba</groupId>

hiatmp-hidden-danger-server/pom.xml

@@ -8,7 +8,7 @@
         <version>0.1.0-SNAPSHOT</version>
         <relativePath>../hiatmp-parent/pom.xml</relativePath>
     </parent>
-    <version>0.2.2-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hiatmp-hidden-danger-server</artifactId>
 

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/CommonController.java

@@ -1,3 +1,4 @@
+/*
 package com.hisense.hiatmp.server_api.controller;
 
 import cn.hutool.http.HttpUtil;
@@ -71,22 +72,26 @@ public class CommonController extends HiatmpController {
         imageContentType.put("gif", "image/gif");
     }
 
-    /**
+    */
+/**
      * 获取当前登录账号信息
      *
      * @return
-     */
+     *//*
+
     @GetMapping(value = "/getOperator")
     public ServerResponse<?> getOperator() {
         OperatorVO vo = this.getOperatorVo();
         return ServerResponse.ok(vo);
     }
 
-    /**
+    */
+/**
      * 获取绑定用户
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "获取绑定用户")
     @GetMapping(value = "/getBindOperator")
     public ServerResponse<?> getBindOperator(@RequestParam(required = false) String oauthUserId,
@@ -262,11 +267,13 @@ public class CommonController extends HiatmpController {
             InetAddress address = InetAddress.getLocalHost();//获取的是本地的IP地址 //PC-20140317PXKX/192.168.0.121
             String hostAddress = address.getHostAddress();//192.168.0.121
             operatorVO.setIp(hostAddress);
+*/
 /*        if (request.getHeader("clientIp") != null) {
             operatorVO.setIp(request.getHeader("clientIp"));
         } else {
             operatorVO.setIp(request.getRemoteAddr());
-        }*/
+        }*//*
+
             operatorVO.setDepartmentid(operator.getCdepartmentid());
 
             operatorVO.setDescription(operator.getCdescription());
@@ -319,11 +326,13 @@ public class CommonController extends HiatmpController {
         }
     }
 
-    /**
+    */
+/**
      * 绑定用户
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "绑定用户")
     @PostMapping("/insertBindOperator")
     public ServerResponse<?> insertBindOperator(@RequestBody BindOperatorDTO dto) {
@@ -398,11 +407,13 @@ public class CommonController extends HiatmpController {
         }
     }
 
-    /**
+    */
+/**
      * 获取所有部门列表
      *
      * @return
-     */
+     *//*
+
     @RequestMapping("/getDepartmentList")
     public ServerResponse<List<Department>> getDepartmentList() {
         try {
@@ -414,11 +425,13 @@ public class CommonController extends HiatmpController {
         }
     }
 
-    /**
+    */
+/**
      * 获取所有部门列表
      *
      * @return
-     */
+     *//*
+
     @RequestMapping("/getDepartmentListByLevel")
     public ServerResponse<List<Department>> getDepartmentListByLevel(@RequestParam("nlevel") String nlevel) {
         try {
@@ -431,11 +444,13 @@ public class CommonController extends HiatmpController {
     }
 
 
-    /**
+    */
+/**
      * 获取所有部门列表
      *
      * @return
-     */
+     *//*
+
 
     @ApiOperation(value = "根据区域获取部门", position = 1)
     @PostMapping("/queryDeptAndArea")
@@ -545,11 +560,13 @@ public class CommonController extends HiatmpController {
         return operatorVO;
     }
 
-    /**
+    */
+/**
      * 系统表中获取视频访问地址
      *
      * @throws Exception
-     */
+     *//*
+
     @RequestMapping("/doGetVideoUrl")
     public ServerResponse<Map> doGetVideoUrl(@RequestBody Map<String, String> json) {
         Map map = new HashMap();
@@ -570,11 +587,13 @@ public class CommonController extends HiatmpController {
         }
     }
 
-    /**
+    */
+/**
      * 获取节假日列表数据
      *
      * @return
-     */
+     *//*
+
     @PostMapping("/getHolidayList")
     public ServerResponse getHolidayList(@RequestBody Map<String, String> param) throws Exception {
         Map data = new HashMap();
@@ -589,11 +608,13 @@ public class CommonController extends HiatmpController {
         return ServerResponse.ok(holidayList);
     }
 
-    /**
+    */
+/**
      * 获取指定视频id的相关信息，包括第三方编号的预置位
      *
      * @return
-     */
+     *//*
+
     @RequestMapping("/getVideoInfo")
     public ServerResponse<Map> getVideoInfo(@RequestBody Map<String, String> param) {
         try {
@@ -615,11 +636,13 @@ public class CommonController extends HiatmpController {
         }
     }
 
-    /**
+    */
+/**
      * 获取指定视频第三方编号的相关信息，包括的预置位
      *
      * @return
-     */
+     *//*
+
     @RequestMapping("/getVideoInfoByThirdCode")
     public ServerResponse<List> getVideoInfoByThirdCode(@RequestBody Map<String, String> param) {
         List result = new ArrayList();
@@ -633,11 +656,13 @@ public class CommonController extends HiatmpController {
         }
     }
 
-    /**
+    */
+/**
      * 获取一张图区域
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "获取城市区域数据")
     @PostMapping("/getAreaList")
     public ServerResponse<List<AreaContent>> getAreaList(@RequestBody AreaQuery areaModel) {
@@ -650,11 +675,13 @@ public class CommonController extends HiatmpController {
 
     }
 
-    /**
+    */
+/**
      * 获取中心点
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "获取社会辖区区域数据")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "socialDeptType", dataType = "String", value = "1:车管所 2:车管所分所 15,16,17:考试场地 25:4S店 20:体检医院  22,99机车交易中心 14检测站"),
@@ -666,11 +693,13 @@ public class CommonController extends HiatmpController {
 
     }
 
-    /**
+    */
+/**
      * 获取中心点
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "获取部门所属区域")
     @PostMapping("/getAllDepartmentAreaList")
     public ServerResponse<List<District>> getAllDepartmentAreaList() {
@@ -679,12 +708,14 @@ public class CommonController extends HiatmpController {
 
     }
 
-    /**
+    */
+/**
      * 查询坐标点最近的路段、路口、辖区
      *
      * @param coordinate 单个坐标点
      * @return Map
-     */
+     *//*
+
     @ApiOperation(value = "查询坐标点最近的路段、路口、辖区")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "coordinate", dataType = "String"),
@@ -700,12 +731,14 @@ public class CommonController extends HiatmpController {
     }
 
 
-    /**
+    */
+/**
      * 保存日志
      *
      * @param logDataDTO 日志实体
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "保存日志记录")
     @PostMapping("/saveLoginLog")
     public ServerResponse saveLoginLog(@RequestBody LogDataDTO logDataDTO) {
@@ -724,12 +757,14 @@ public class CommonController extends HiatmpController {
     }
 
 
-    /**
+    */
+/**
      * 查询坐标点最近的路段、路口、辖区
      *
      * @param coordinateList 多个坐标点
      * @return List<Map>
-     */
+     *//*
+
     @ApiOperation(value = "查询坐标点最近的路段、路口、辖区")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", name = "coordinateList", dataType = "String"),
@@ -740,11 +775,13 @@ public class CommonController extends HiatmpController {
         return ServerResponse.ok(pointInfoList);
     }
 
-    /**
+    */
+/**
      * 根据用户id 获取菜单权限
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "根据用户id 获取菜单权限(树形式)")
     @GetMapping("/getMenuTreeByUserId")
     public ServerResponse<List<Menu>> getMenuTreeByUserId(@RequestParam String userId) {
@@ -753,11 +790,13 @@ public class CommonController extends HiatmpController {
 
     }
 
-    /**
+    */
+/**
      * 根据用户id 获取所有父部门
      *
      * @return
-     */
+     *//*
+
     @ApiOperation(value = "根据用户id 获取所有父类")
     @GetMapping("/getAllParentByUserId")
     public ServerResponse<List<DepartmentVO>> getAllParentByUserId(@RequestParam String userId) {
@@ -766,4 +805,4 @@ public class CommonController extends HiatmpController {
 
     }
 
-}
+}*/

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java

@@ -727,7 +727,7 @@ public class HighDangerController {
     }
 
     // 图片上传接口
-    @PostMapping("/uploadImage")
+    /*@PostMapping("/uploadImage")
     public ServerResponse<?> uploadImage(@RequestBody MultipartFile multipartFile) throws IOException {
 
         if(multipartFile.isEmpty()){
@@ -746,6 +746,6 @@ public class HighDangerController {
         }else{
             return ServerResponse.error("上传的文件不是图片类型!");
         }
-    }
+    }*/
 
 }

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java

@@ -21,7 +21,7 @@ public interface HighDangerService {
 
     List<ThtDangerItems> listWithTree();
 
-    String saveMultipartFiles(MultipartFile multipartFiles) throws IOException;
+    //String saveMultipartFiles(MultipartFile multipartFiles) throws IOException;
 
     Boolean isPicture(MultipartFile file);
 

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/ICommonService.java

@@ -1,3 +1,4 @@
+/*
 package com.hisense.hiatmp.server_api.service;
 
 
@@ -11,44 +12,54 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-/*@Transactional(rollbackFor = Exception.class)I*/
+*/
+/*@Transactional(rollbackFor = Exception.class)I*//*
+
 public interface ICommonService {
 
     List<Map<String, String>> getEnumList(List<Long> enumIds);
 
-    /**
+    */
+/**
      * 获取全部的部门列表
      *
      * @return
      * @throws Exception
-     */
+     *//*
+
     public List<Department> getDepartmentList() throws Exception;
 
-    /**
+    */
+/**
      * 根据级别获取部门列表
      *
      * @return
      * @throws Exception
-     */
+     *//*
+
     public List<Department> getDepartmentListByLevel(String nlevel) throws Exception;
 
 
-    /**
+    */
+/**
      * 根据参数名查询系统表sysparams中的信息：如视频地址
      *
      * @param paramCode
      * @return
      * @throws Exception
-     */
+     *//*
+
     public List<String> getSysParamValue(String paramCode) throws Exception;
 
-    /**
+    */
+/**
      * 设备空间查询接口
      *
      * @param query
      * @return
      * @throws Exception
-     */
+     *//*
+
     public List queryEquip(MapQueryVO query) throws Exception;
 
     Operator getCurrentUser(String userId);
@@ -83,37 +94,45 @@ public interface ICommonService {
 
     Boolean saveLoginLog(OperatorVO operatorVo, LogDataDTO logDataDTO);
 
-    /**
+    */
+/**
      * 获取第三方用户是否已授权绑定账号
      *
      * @return
      * @throws Exception
-     */
+     *//*
+
     String getBindOperator(String oauthUserId);
 
-    /***
+    */
+/***
      * 绑定账号
      * @param dto
-     */
+     *//*
+
     void insertBindOperator(BindOperatorDTO dto);
 
-    /**
+    */
+/**
      * 获取绑定的账号对应账号表里的密码
      *
      * @param dto
      * @return
-     */
+     *//*
+
     String getUserPwd(BindOperatorDTO dto);
 
     String addUserToSessionCache(String userId);
 
     List<Menu> getMenuTreeByUserId(String userId);
 
-    /**
+    */
+/**
      * @param userId
      * @param type   "1"-查nuserid，“2”查身份证 是否存在于operator表中
      * @return
-     */
+     *//*
+
     String getIfHaveUser(String userId, String type);
 
     String getDeptIdByUserId(String userId);
@@ -127,3 +146,4 @@ public interface ICommonService {
 }
 
 
+*/

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/CommonServiceImpl.java

@@ -1,3 +1,4 @@
+/*
 package com.hisense.hiatmp.server_api.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -369,23 +370,27 @@ public class CommonServiceImpl implements ICommonService {
     }
 
 
-    /**
+    */
+/**
      * 查看第三方编号
      *
      * @param deviceId
      * @return
-     */
+     *//*
+
     @Override
     public List<String> getEquipmentInfo(String deviceId) {
         return commonMapper.getEquipmentInfo(deviceId);
     }
 
-    /**
+    */
+/**
      * 查看预置位信息
      *
      * @param deviceId
      * @return
-     */
+     *//*
+
     @Override
     public List<Map> getPresetList(String deviceId) {
         return commonMapper.getPresetList(deviceId);
@@ -707,13 +712,15 @@ public class CommonServiceImpl implements ICommonService {
 
     }
 
-    /**
+    */
+/**
      * 根据父节点的ID获取所有子节点
      *
      * @param list     分类表
      * @param parentId 传入的父节点ID
      * @return String
-     */
+     *//*
+
     public List<Menu> getChildPerms(List<Menu> list, String parentId) {
         List<Menu> returnList = new ArrayList<Menu>();
         for (Iterator<Menu> iterator = list.iterator(); iterator.hasNext(); ) {
@@ -740,12 +747,14 @@ public class CommonServiceImpl implements ICommonService {
         return returnList;
     }
 
-    /**
+    */
+/**
      * 列表排序
      *
      * @param
      * @param
-     */
+     *//*
+
     private void orderFn(Menu m) {
         List<Menu> menuList = m.getMenuList();
         if (CollectionUtil.isEmpty(menuList)) {
@@ -761,12 +770,14 @@ public class CommonServiceImpl implements ICommonService {
         });
     }
 
-    /**
+    */
+/**
      * 递归列表
      *
      * @param list
      * @param t
-     */
+     *//*
+
     private void recursionFn(List<Menu> list, Menu t) {
         // 得到子节点列表
         List<Menu> childList = getChildList(list, t);
@@ -783,9 +794,11 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
-    /**
+    */
+/**
      * 得到子节点列表
-     */
+     *//*
+
     private List<Menu> getChildList(List<Menu> list, Menu t) {
         List<Menu> tlist = new ArrayList<Menu>();
         Iterator<Menu> it = list.iterator();
@@ -806,19 +819,23 @@ public class CommonServiceImpl implements ICommonService {
         return tlist;
     }
 
-    /**
+    */
+/**
      * 判断是否有子节点
-     */
+     *//*
+
     private boolean hasChild(List<Menu> list, Menu t) {
         return getChildList(list, t).size() > 0 ? true : false;
     }
 
-    /**
+    */
+/**
      * 将用户添加到session缓存
      *
      * @param userId
      * @return
-     */
+     *//*
+
     @Override
     public String addUserToSessionCache(String userId) {
         try {
@@ -841,12 +858,14 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
-    /**
+    */
+/**
      * 判断是否存在该用户
      *
      * @param userId
      * @return
-     */
+     *//*
+
     @Override
     public String getIfHaveUser(String userId, String type) {
         String ifHaveUser = "";
@@ -917,4 +936,4 @@ public class CommonServiceImpl implements ICommonService {
     public String getIfBinded(String userId, String dataBase) {
         return commonMapper.getIfBinded(userId, dataBase);
     }
-}
+}*/

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java

@@ -24,8 +24,8 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
 
     private static final double EARTH_RADIUS = 6378137;
 
-    @Value("${file.path.local}")
-    private String fileLocalPath;
+    /*@Value("${file.path.local}")
+    private String fileLocalPath;*/
 
     private static SimpleDateFormat sfFile = new SimpleDateFormat("yyyyMMddHHmmss");
 
@@ -140,7 +140,7 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
 //        return paths;
 //    }
 
-    @Override
+    /*@Override
     public String saveMultipartFiles(MultipartFile file) throws IOException {
 
         Image img = null;
@@ -179,7 +179,7 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
 //        } else {
 //            return new FileSaveDTO(name, saveName, false);
 //        }
-    }
+    }*/
 
     public Boolean isPicture(MultipartFile file) {
         Image img = null;

hiatmp-hidden-danger-server/src/main/resources/application.yml

@@ -11,10 +11,10 @@ spring:
   multipart:
    max-file-size: 100MB
    max-request-size: 200MB
- cloud:
-  nacos:
-   discovery:
-    server-addr: 10.16.3.178:8848
+# cloud:
+#  nacos:
+#   discovery:
+#    server-addr: 10.16.3.178:8848
     #server-addr: localhost:8848
  #6.1管控平台数据库地址、账号、密码,根据项目现场进行修改
  datasource:
@@ -35,23 +35,22 @@ spring:
    test-while-idle: true
    test-on-borrow: false
    test-on-return: false
- redis:
-  database: 0
-  host: 10.16.3.179
-  port: 6379
-  password: Hiface.1
-  timeout: 10000
+# redis:
+#  database: 0
+#  host: 10.16.3.179
+#  port: 6379
+#  password: Hiface.1
+#  timeout: 10000
  #ftp配置
  ftp:
-  username: ysz
-  password: ysz
-  host: localhost
-  port: 21
+  username: thtapp
+  password: thtapp
+  host: 123.56.124.174
+  port: 8221
   #currentdir: /ftpdate/hisense_ftp_directory/
-  currentdir: D:\ftpfile
+  currentdir: /
  ftp-http:
-  #url: http://53.101.226.90:8188/
-  url: http://53.101.226.90:8188/
+  url: http://123.56.124.174:8021/
 pagehelper:
  helper-dialect: postgresql
  reasonable: true
@@ -61,30 +60,30 @@ pagehelper:
 
 
 # 登录过期时间
-expiration:
- time: 60 * 60 * 24
+#expiration:
+ #time: 60 * 60 * 24
 
-file:
- path:
-  local:
+#file:
+ #path:
+  #local:
 #   /www/wwwroot/hiatmp/pic
-   D:\DEV\Code\highDanger\pic\
-ssoUrl: http://10.16.3.178:801
+   #D:\DEV\Code\highDanger\pic\
+#ssoUrl: http://10.16.3.178:801
 # 下面部分为mybatis及log配置，一般不需修改
 mybatis:
  mapper-locations: classpath*:sql-mapper/*.xml
  mapUnderscoreToCamelCase: true
 logging:
  config: classpath:log4j2.xml
-jasypt:
- encryptor:
-  password: G0CvDz7oJn6
- encrypted: 0
- keys:
-  - spring.datasource.primary.password
-  - spring.datasource.primary.username
-  - spring.datasource2.password
-  - spring.datasource2.username
-  - spring.datasource3.password
-  - spring.datasource3.username
-addUserUrl: 157.3.132.31:50083/system/user/gs/add
+#jasypt:
+# encryptor:
+#  password: G0CvDz7oJn6
+# encrypted: 0
+# keys:
+#  - spring.datasource.primary.password
+#  - spring.datasource.primary.username
+#  - spring.datasource2.password
+#  - spring.datasource2.username
+#  - spring.datasource3.password
+#  - spring.datasource3.username
+#addUserUrl: 157.3.132.31:50083/system/user/gs/add

hiatmp-log/pom.xml

@@ -38,10 +38,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-log4j2</artifactId>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>com.oracle</groupId>
       <artifactId>ojdbc6</artifactId>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>druid</artifactId>

hiatmp-parent/pom.xml

@@ -139,11 +139,11 @@
                 <artifactId>spring-cloud-starter-openfeign</artifactId>
                 <version>${openfeign.version}</version>
             </dependency>
-            <dependency>
+            <!--<dependency>
                 <groupId>com.oracle</groupId>
                 <artifactId>ojdbc6</artifactId>
                 <version>${oracle.ojdbc.version}</version>
-            </dependency>
+            </dependency>-->
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi</artifactId>

pom.xml

@@ -7,9 +7,9 @@
         <version>2.1.4.RELEASE</version>
         <relativePath/>
     </parent>
-    <modules>
+    <!--<modules>
         <module>hiatmp-hidden-danger-server</module>
-    </modules>
+    </modules>-->
     <properties>
         <java.version>1.8</java.version>
         <spring-cloud.version>Greenwich.SR1</spring-cloud.version>