首页数据展示接口和排查任务列表

master
Zangzhipeng 2 years ago
parent d67cf3db42
commit 7bcd905806
  1. 2
      .idea/compiler.xml
  2. 47
      hiatmp-admin-server/pom.xml
  3. 2
      hiatmp-admin-server/src/main/java/com/hisense/hiatmp/adminServer/constant/CommonConstant.java
  4. 17
      hiatmp-admin-server/src/main/resources/application.yml
  5. 17
      hiatmp-admin-server/target/classes/application.yml
  6. BIN
      hiatmp-admin-server/target/classes/com/hisense/hiatmp/adminServer/AdminServerMain.class
  7. 32
      hiatmp-api-server/pom.xml
  8. 11
      hiatmp-base/pom.xml
  9. 50
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/HighDangerController.java
  10. 32
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/controller/OperatorController.java
  11. 27
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/mapper/HighDangerMapper.java
  12. 11
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/mapper/OperatorMapper.java
  13. 25
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/model/OperatorDTO.java
  14. 14
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/service/HighDangerService.java
  15. 10
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/service/OperatorService.java
  16. 26
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/service/impl/HighDangerBaseServiceImpl.java
  17. 19
      hiatmp-base/src/main/java/com/hisense/hiatmp/base/service/impl/OperatorServiceImpl.java
  18. 114
      hiatmp-base/src/main/resources/application.yml
  19. 264
      hiatmp-base/src/main/resources/sql-mapper/CommonMapper.xml
  20. 69
      hiatmp-base/src/main/resources/sql-mapper/HighDangerMapper.xml
  21. 11
      hiatmp-base/src/main/resources/sql-mapper/OperatorMapper.xml
  22. 6
      hiatmp-base/target/classes/application.yml
  23. 264
      hiatmp-base/target/classes/sql-mapper/CommonMapper.xml
  24. 2
      hiatmp-common/src/main/java/com/hisense/hiatmp/common/mapper/CommonUserMapper.java
  25. 4
      hiatmp-common/src/main/java/com/hisense/hiatmp/common/service/ICommonUserService.java
  26. 18
      hiatmp-common/src/main/java/com/hisense/hiatmp/common/service/impl/CommonUserServiceImpl.java
  27. 5
      hiatmp-common/src/main/resources/sql-mapper/CommonUserMapper.xml
  28. BIN
      hiatmp-common/target/classes/com/hisense/hiatmp/common/mapper/CommonUserMapper.class
  29. BIN
      hiatmp-common/target/classes/com/hisense/hiatmp/common/service/ICommonUserService.class
  30. BIN
      hiatmp-common/target/classes/com/hisense/hiatmp/common/service/impl/CommonUserServiceImpl.class
  31. 5
      hiatmp-common/target/classes/sql-mapper/CommonUserMapper.xml
  32. 24
      hiatmp-gateway/target/classes/application.yml
  33. 166
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java
  34. 43
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBaseNum.java
  35. 6
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/Operator.java
  36. BIN
      hiatmp-model/target/classes/com/hisense/hiatmp/model/common/Operator.class
  37. 2
      hiatmp-parent/pom.xml
  38. 3097
      log/error.log
  39. 8066
      log/info.log
  40. 50
      log/monitor-info.log
  41. 94
      log/test.log
  42. 3321
      log/warn.log
  43. 22
      pom.xml

@ -11,7 +11,6 @@
<module name="hiatmp-log" />
<module name="hiatmp-gateway" />
<module name="hiatmp-log-api" />
<module name="hiatmp-api-server" />
<module name="hiatmp-common" />
<module name="hiatmp-model" />
<module name="urbantraffic-hiatmp-dao-maplayer" />
@ -19,6 +18,7 @@
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="hiatmp-api-server" target="1.8" />
<module name="test" target="1.8" />
<module name="urbantraffic-hiatmp-dao-maplayer" target="1.8" />
<module name="urbantraffic-hiatmp-dao-maplayer-pingdu" target="1.8" />

@ -14,13 +14,6 @@
<name>hiatmp-admin-server</name>
<dependencies>
<!-- <dependency>-->
<!-- <groupId>com.hisense.urbantraffic</groupId>-->
<!-- <artifactId>hiatmp-common</artifactId>-->
<!-- <version>0.1.0-SNAPSHOT</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@ -49,46 +42,6 @@
<artifactId>spring-boot-starter-security</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.alibaba</groupId>-->
<!-- <artifactId>tools</artifactId>-->
<!-- <version>1.8.0</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>3.5.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.7</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-core</artifactId>
<version>3.5.7</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
<version>3.5.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies>
<build>

@ -11,20 +11,3 @@ spring:
name: hisense
password: N5HWw9Hn3jxD
datasource:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://118.89.79.160:5432/postgres
username: postgres
password: postgres123
# type: com.alibaba.druid.pool.DruidDataSource
# 配置获取连接等待超时的时间,单位毫秒
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位毫秒
time-between-eviction-runs-millis: 60000
# 配置一个连接在池中最小生存的时间,单位毫秒
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false

@ -11,20 +11,3 @@ spring:
name: hisense
password: N5HWw9Hn3jxD
datasource:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://118.89.79.160:5432/postgres
username: postgres
password: postgres123
# type: com.alibaba.druid.pool.DruidDataSource
# 配置获取连接等待超时的时间,单位毫秒
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位毫秒
time-between-eviction-runs-millis: 60000
# 配置一个连接在池中最小生存的时间,单位毫秒
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false

@ -44,24 +44,24 @@
<!-- <version>1.8.0</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
<version>3.5.7</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-annotation</artifactId>-->
<!-- <version>3.5.7</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.7</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
<!-- <version>3.5.7</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-core</artifactId>
<version>3.5.7</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-core</artifactId>-->
<!-- <version>3.5.7</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-extension</artifactId>-->

@ -97,6 +97,17 @@
<version>1.5.21</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-extension</artifactId>-->
<!-- <version>3.5.7</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.hisense.urbantraffic</groupId>
<artifactId>hiatmp-common</artifactId>

@ -0,0 +1,50 @@
package com.hisense.hiatmp.base.controller;
import com.hisense.hiatmp.base.mapper.HighDangerMapper;
import com.hisense.hiatmp.base.mapper.OperatorMapper;
import com.hisense.hiatmp.base.model.OperatorDTO;
import com.hisense.hiatmp.model.common.HighDangerBase;
import com.hisense.hiatmp.model.common.HighDangerBaseNum;
import com.hisense.hiatmp.model.common.HighDangerBaseVO;
import com.hisense.hiatmp.model.common.ServerResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping(value = "/highDanger")
public class HighDangerController {
@Autowired
OperatorMapper operatorMapper;
@Autowired
HighDangerMapper highDangerMapper;
// 查询各个状态的数据情况
@GetMapping("/getHighDangerStatusNum/{nuserid}")
public ServerResponse<?> getHighStatusNum(@PathVariable String nuserid){
OperatorDTO operatorById = operatorMapper.getOperatorById(nuserid);
String cdepartmentid = operatorById.getCdepartmentid();
List<HighDangerBaseNum> statusCounts = highDangerMapper.getStatusCounts(cdepartmentid);
return ServerResponse.ok(statusCounts);
}
// 查询各状态列表
@GetMapping("/getHigDangerDealt")
public ServerResponse<?> getHighDealt(@RequestBody HighDangerBaseVO highDangerBaseVO){
OperatorDTO operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getNuserid());
String cdepartmentid = operatorById.getCdepartmentid();
List<HighDangerBase> statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid);
return ServerResponse.ok(statusCounts);
}
}

@ -0,0 +1,32 @@
package com.hisense.hiatmp.base.controller;
import com.hisense.hiatmp.base.mapper.OperatorMapper;
import com.hisense.hiatmp.base.model.OperatorDTO;
import com.hisense.hiatmp.model.common.ServerResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/operator")
public class OperatorController {
@Autowired
OperatorMapper operatorMapper;
// 查询指定用户
@GetMapping("/getOperatorById/{nuserid}")
public ServerResponse<?> getOperatorById(@PathVariable String nuserid){
OperatorDTO operatorById = operatorMapper.getOperatorById(nuserid);
if(operatorById != null){
return ServerResponse.ok(operatorById);
}else{
return ServerResponse.error("未查询到用户信息");
}
}
}

@ -0,0 +1,27 @@
package com.hisense.hiatmp.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hisense.hiatmp.model.common.HighDangerBase;
import com.hisense.hiatmp.model.common.HighDangerBaseNum;
import com.hisense.hiatmp.model.common.HighDangerBaseVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@Repository
public interface HighDangerMapper {
// String getHighDangerStatusNum(@Param("postId") String postId);
List<HighDangerBaseNum> getStatusCounts(String cdepartmentid);
List<HighDangerBase> getHigDangerDealt(String status, String cdepartmentid);
}

@ -0,0 +1,11 @@
package com.hisense.hiatmp.base.mapper;
import com.hisense.hiatmp.base.model.OperatorDTO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Repository
public interface OperatorMapper {
OperatorDTO getOperatorById(@Param("nuserid") String nuserid);
}

@ -0,0 +1,25 @@
package com.hisense.hiatmp.base.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@Data
public class OperatorDTO implements Serializable {
private static final long serialVersionUID = -8763233643579533470L;
// 用户警号
private String nuserid;
// 用户名称
private String cusername;
// 用户密码
@JsonIgnore
private String cuserpwd;
// 客户端ip
private String ip;
private String cdescription;
private String phone;
private String cdepartmentid;
}

@ -0,0 +1,14 @@
package com.hisense.hiatmp.base.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hisense.hiatmp.model.common.HighDangerBase;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public interface HighDangerService {
List<Map<String, String>> getHighDangerStatusNum(String nuserid);
}

@ -0,0 +1,10 @@
package com.hisense.hiatmp.base.service;
import com.hisense.hiatmp.base.model.OperatorDTO;
import org.springframework.stereotype.Service;
@Service
public interface OperatorService {
public OperatorDTO getOperatorById(String nuserid);
}

@ -0,0 +1,26 @@
package com.hisense.hiatmp.base.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hisense.hiatmp.base.mapper.CommonMapper;
import com.hisense.hiatmp.base.mapper.HighDangerMapper;
import com.hisense.hiatmp.base.service.HighDangerService;
import com.hisense.hiatmp.model.common.HighDangerBase;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@Service
public class HighDangerBaseServiceImpl implements HighDangerService {
@Autowired
private HighDangerMapper highDangerMapper;
@Override
public List<Map<String, String>> getHighDangerStatusNum(String nuserid) {
return Collections.emptyList();
}
}

@ -0,0 +1,19 @@
package com.hisense.hiatmp.base.service.impl;
import com.hisense.hiatmp.base.mapper.OperatorMapper;
import com.hisense.hiatmp.base.model.OperatorDTO;
import com.hisense.hiatmp.base.service.OperatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class OperatorServiceImpl implements OperatorService {
@Autowired
OperatorMapper operatorMapper;
@Override
public OperatorDTO getOperatorById(String nuserid) {
return operatorMapper.getOperatorById(nuserid);
}
}

@ -1,77 +1,59 @@
server:
port: 1959
servlet:
context-path: /HiatmpPro/commond
port: 1959
servlet:
context-path: /HiatmpPro/commond
#运行模式 开发环境:dev 测试环境:test 生产环境: production
run-mode: dev
spring:
application:
name: urbantraffic-hiatmp-base
# cloud:
# nacos:`
# discovery:
## server-addr: 10.16.3.178:8848
# server-addr: localhost:8848
#6.1管控平台数据库地址、账号、密码,根据项目现场进行修改
datasource:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://118.89.79.160:5432/postgres
username: postgres
password: postgres123
type: com.alibaba.druid.pool.DruidDataSource
# 配置获取连接等待超时的时间,单位毫秒
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位毫秒
time-between-eviction-runs-millis: 60000
# 配置一个连接在池中最小生存的时间,单位毫秒
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
# datasource:
# primary:
# jdbc-url: jdbc:postgresql://118.89.79.160:5432/postgres
# username: postgres
# password: postgres123
# # 下面为数据库连接池相关参数,一般不需修改
# driver-class-name: org.postgresql.Driver
# type: com.alibaba.druid.pool.DruidDataSource
# # 配置获取连接等待超时的时间,单位毫秒
# maxWait: 60000
# # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位毫秒
# time-between-eviction-runs-millis: 60000
# # 配置一个连接在池中最小生存的时间,单位毫秒
# min-evictable-idle-time-millis: 300000
# validation-query: SELECT 1 FROM DUAL
# test-while-idle: true
# test-on-borrow: false
# test-on-return: false
redis:
database: 0
# host: 10.16.3.179
host: 127.0.0.1
port: 6379
password:
timeout: 10000
application:
name: urbantraffic-hiatmp-base
cloud:
nacos:
discovery:
server-addr: 10.16.3.178:8848
#server-addr: localhost:8848
#6.1管控平台数据库地址、账号、密码,根据项目现场进行修改
datasource:
primary:
jdbc-url: jdbc:postgresql://118.89.79.160:5432/postgres
username: postgres
password: postgres123
# 下面为数据库连接池相关参数,一般不需修改
driver-class-name: org.postgresql.Driver
type: com.alibaba.druid.pool.DruidDataSource
# 配置获取连接等待超时的时间,单位毫秒
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位毫秒
time-between-eviction-runs-millis: 60000
# 配置一个连接在池中最小生存的时间,单位毫秒
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
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
ssoUrl: http://10.16.3.178:801
# 下面部分为mybatis及log配置,一般不需修改
mybatis:
mapper-locations: classpath*:sql-mapper/*.xml
mapUnderscoreToCamelCase: true
mapper-locations: classpath*:sql-mapper/*.xml
mapUnderscoreToCamelCase: true
logging:
config: classpath:log4j2.xml
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
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

@ -4,80 +4,72 @@
<mapper namespace="com.hisense.hiatmp.base.mapper.CommonMapper">
<insert id="saveVmsExecute" parameterType="com.hisense.hiatmp.model.pis.VmsExecute">
insert into PIS_VMS_EXECUTE (
ID,
DEVICE_ID,
RELEASE_TIME_START,
RELEASE_TIME_END,
ELEMENT_ID,
PLAN_ID,
ORDER_ID,
CASE_ID,
warn_Time
)
values (
#{id,jdbcType=VARCHAR},
#{deviceId,jdbcType=VARCHAR},
#{releaseTimeStart,jdbcType=TIMESTAMP},
#{releaseTimeEnd,jdbcType=TIMESTAMP},
#{elementId,jdbcType=VARCHAR},
#{planId,jdbcType=VARCHAR},
#{orderId,jdbcType=VARCHAR},
#{caseId,jdbcType=VARCHAR},
#{warnTime,jdbcType=VARCHAR}
)
insert into PIS_VMS_EXECUTE (ID,
DEVICE_ID,
RELEASE_TIME_START,
RELEASE_TIME_END,
ELEMENT_ID,
PLAN_ID,
ORDER_ID,
CASE_ID,
warn_Time)
values (#{id,jdbcType=VARCHAR},
#{deviceId,jdbcType=VARCHAR},
#{releaseTimeStart,jdbcType=TIMESTAMP},
#{releaseTimeEnd,jdbcType=TIMESTAMP},
#{elementId,jdbcType=VARCHAR},
#{planId,jdbcType=VARCHAR},
#{orderId,jdbcType=VARCHAR},
#{caseId,jdbcType=VARCHAR},
#{warnTime,jdbcType=VARCHAR})
</insert>
<insert id="saveLoginLog">
insert into LOG_DATA (
NID,
LOGTYPE,
USERID,
CARDID,
USERNAME,
DEPARTMENTNAME,
DEPARTMENTID,
LOGTIME,
CLIENTIP,
CLIENTID,
OPERATETYPE,
FAILCODE,
OPERATETARGET,
OPERATECONTENT,
SYSTEMID,
FIRSTMENUID,
SECONDMENUID,
FUNCTIONID,
FUNCTIONNAME
)
values (
#{nid,jdbcType=VARCHAR},
#{logtype,jdbcType=VARCHAR},
#{userid,jdbcType=VARCHAR},
#{cardid,jdbcType=VARCHAR},
#{username,jdbcType=VARCHAR},
#{departmentname,jdbcType=VARCHAR},
#{departmentid,jdbcType=VARCHAR},
#{logtime,jdbcType=TIMESTAMP},
#{clientip,jdbcType=VARCHAR},
#{clientid,jdbcType=VARCHAR},
#{operatetype,jdbcType=VARCHAR},
#{failcode,jdbcType=VARCHAR},
#{operatetarget,jdbcType=VARCHAR},
#{operatecontent,jdbcType=VARCHAR},
#{systemid,jdbcType=VARCHAR},
#{firstmenuid,jdbcType=TIMESTAMP},
#{secondmenuid,jdbcType=VARCHAR},
#{functionid,jdbcType=VARCHAR},
#{functionname,jdbcType=VARCHAR}
)
insert into LOG_DATA (NID,
LOGTYPE,
USERID,
CARDID,
USERNAME,
DEPARTMENTNAME,
DEPARTMENTID,
LOGTIME,
CLIENTIP,
CLIENTID,
OPERATETYPE,
FAILCODE,
OPERATETARGET,
OPERATECONTENT,
SYSTEMID,
FIRSTMENUID,
SECONDMENUID,
FUNCTIONID,
FUNCTIONNAME)
values (#{nid,jdbcType=VARCHAR},
#{logtype,jdbcType=VARCHAR},
#{userid,jdbcType=VARCHAR},
#{cardid,jdbcType=VARCHAR},
#{username,jdbcType=VARCHAR},
#{departmentname,jdbcType=VARCHAR},
#{departmentid,jdbcType=VARCHAR},
#{logtime,jdbcType=TIMESTAMP},
#{clientip,jdbcType=VARCHAR},
#{clientid,jdbcType=VARCHAR},
#{operatetype,jdbcType=VARCHAR},
#{failcode,jdbcType=VARCHAR},
#{operatetarget,jdbcType=VARCHAR},
#{operatecontent,jdbcType=VARCHAR},
#{systemid,jdbcType=VARCHAR},
#{firstmenuid,jdbcType=TIMESTAMP},
#{secondmenuid,jdbcType=VARCHAR},
#{functionid,jdbcType=VARCHAR},
#{functionname,jdbcType=VARCHAR})
</insert>
<delete id="deleteVmsExecute">
delete from PIS_VMS_Execute p where p.device_id = #{deviceId,jdbcType=VARCHAR}
delete
from PIS_VMS_Execute p
where p.device_id = #{deviceId,jdbcType=VARCHAR}
</delete>
@ -100,9 +92,9 @@
<select id="getPostName" resultType="String">
select enumname
from enum_type e
join pic_post_role_relation r on r.post_type = e.enumvalue
join pic_post_role_relation r on r.post_type = e.enumvalue
where e.enumtypeid = '20000'
and r.role_id = #{postId}
and r.role_id = #{postId}
</select>
@ -114,13 +106,18 @@
<select id="queryEquip" parameterType="java.lang.String" resultType="java.util.Map">
${sqlStr}
</select>
<!-- <select id="getDepartmentList" resultType="com.hisense.hiatmp.model.common.Department">-->
<!-- select t.*, d.coordinate, f.coordinate as coordinateCenter-->
<!-- from department t-->
<!-- left join district d-->
<!-- on d.dept_id = t.cdepartmentid-->
<!-- left join face_district_center f-->
<!-- on f.area_dept_id = d.dept_id-->
<!-- order by t.cdepartmentcode asc-->
<!-- </select>-->
<select id="getDepartmentList" resultType="com.hisense.hiatmp.model.common.Department">
select t.*, d.coordinate, f.coordinate as coordinateCenter
select t.* as coordinateCenter
from department t
left join district d
on d.dept_id = t.cdepartmentid
left join face_district_center f
on f.area_dept_id = d.dept_id
order by t.cdepartmentcode asc
</select>
<select id="getDepartmentListByLevel" resultType="com.hisense.hiatmp.model.common.Department">
@ -155,15 +152,14 @@
<select id="getOperationList" parameterType="java.lang.String" resultType="String">
SELECT DISTINCT ROR.OPERATIONID
FROM USER_ROLE_RELATION URR
LEFT JOIN ROLE_OPERATION_RELATION ROR ON ROR.ROLEID = URR.ROLEID
LEFT JOIN ROLE_OPERATION_RELATION ROR ON ROR.ROLEID = URR.ROLEID
WHERE URR.NUSERID = #{userId}
</select>
<select id="getOperationIdList" parameterType="java.lang.String" resultType="String">
select distinct orel.operationid
from role_operation_relation orel
where orel.roleid in (
SELECT t.roleid FROM USER_ROLE_RELATION t where t.nuserid = #{userId, jdbcType=VARCHAR})
and orel.operationid = #{operationId, jdbcType=VARCHAR}
where orel.roleid in (SELECT t.roleid FROM USER_ROLE_RELATION t where t.nuserid = #{userId, jdbcType=VARCHAR})
and orel.operationid = #{operationId, jdbcType=VARCHAR}
</select>
<select id="getHolidayList" resultType="com.hisense.hiatmp.model.common.HolidayDrop">
select t.holiday_id as holidayId,
@ -335,40 +331,39 @@
</select>
<select id="getGpsList" resultType="com.hisense.hiatmp.base.model.GpsDevice">
select *
from (select ROW_NUMBER() OVER(PARTITION BY g.CVEHID ORDER BY g.DTRECORDTIME DESC) num,
g.cvehid,
g.nvehalarm,
g.dtrecordtime,
g.decarlong as longitude,
g.decarlat as latitude,
g.ncarstatus,
g.nvehspeed,
g.ndirection,
g.datauploadtime,
g.datasavetime,
g.policeid,
g.mdsid,
g.reportstatus,
g.source,
e.thirdsyscode,
e.deviceid,
e.devicename,
e.gpstype,
e.gpsradiono,
et.enumname as gpstypename
from gps_data g
left join equipment_info e
on e.thirdsyscode = g.cvehid
left join (select enumname, enumvalue
from enum_type
where enumtypeid = '734') et
on et.enumvalue = e.gpstype
where g.dtrecordtime >=
sysdate -
(select nvl2(param.paramvalue, param.paramvalue, '5')
from (select t.paramvalue
from sysparams t
where t.paramcode = 'GPS_ONLINE_TIME_INTERVAL') param) / 1440) tt
from (select ROW_NUMBER() OVER(PARTITION BY g.CVEHID ORDER BY g.DTRECORDTIME DESC) num, g.cvehid,
g.nvehalarm,
g.dtrecordtime,
g.decarlong as longitude,
g.decarlat as latitude,
g.ncarstatus,
g.nvehspeed,
g.ndirection,
g.datauploadtime,
g.datasavetime,
g.policeid,
g.mdsid,
g.reportstatus,
g.source,
e.thirdsyscode,
e.deviceid,
e.devicename,
e.gpstype,
e.gpsradiono,
et.enumname as gpstypename
from gps_data g
left join equipment_info e
on e.thirdsyscode = g.cvehid
left join (select enumname, enumvalue
from enum_type
where enumtypeid = '734') et
on et.enumvalue = e.gpstype
where g.dtrecordtime >=
sysdate -
(select nvl2(param.paramvalue, param.paramvalue, '5')
from (select t.paramvalue
from sysparams t
where t.paramcode = 'GPS_ONLINE_TIME_INTERVAL') param) / 1440) tt
where tt.num = 1;
</select>
<select id="getPoliceList" resultType="com.hisense.hiatmp.model.common.Police">
@ -378,19 +373,20 @@
</select>
<select id="getAllDepartmentAreaList" resultType="com.hisense.hiatmp.base.model.District">
select ID,
DEPT_ID,
DISTRICT_CODE,
DISTRICT_NAME,
COORDINATE,
REMARK,
SHORT_NAME,
COLOR,
COLORSHOW
DEPT_ID,
DISTRICT_CODE,
DISTRICT_NAME,
COORDINATE,
REMARK,
SHORT_NAME,
COLOR,
COLORSHOW
from DISTRICT
</select>
<select id="getPresetListByThirdCode" resultType="java.util.Map">
SELECT DISTINCT t.presetid as "presetId", t.presetname as "presetName"
FROM equip_video_preset t join equipment_info e on e.deviceid=t.deviceid
FROM equip_video_preset t
join equipment_info e on e.deviceid = t.deviceid
WHERE e.thirdsyscode = #{thirdsyscode,jdbcType=VARCHAR}
order by t.presetname
</select>
@ -433,12 +429,14 @@
</select>
<insert id="insertBindOperator" parameterType="com.hisense.hiatmp.base.model.BindOperatorDTO">
insert into bda_operator_oauth(oauthuserid, nuserid, oauthtype,xm,sfzh,policeid,dwdm,dwmc,zw, bind_time,visit_time)
insert into bda_operator_oauth(oauthuserid, nuserid, oauthtype, xm, sfzh, policeid, dwdm, dwmc, zw, bind_time,
visit_time)
values (#{oauthUserId, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{oauthType, jdbcType=VARCHAR},
#{xm, jdbcType=VARCHAR}, #{sfzh, jdbcType=VARCHAR}, #{policeId, jdbcType=VARCHAR},
#{dwdm, jdbcType=VARCHAR}, #{dwmc, jdbcType=VARCHAR}, #{zw, jdbcType=VARCHAR},cast(current_timestamp(0) as
timestamp without time zone)
,cast(current_timestamp(0) as timestamp without time zone))
#{xm, jdbcType=VARCHAR}, #{sfzh, jdbcType=VARCHAR}, #{policeId, jdbcType=VARCHAR},
#{dwdm, jdbcType=VARCHAR}, #{dwmc, jdbcType=VARCHAR}, #{zw, jdbcType=VARCHAR},
cast(current_timestamp(0) as
timestamp without time zone)
, cast(current_timestamp(0) as timestamp without time zone))
</insert>
<select id="getUserPwd" resultType="java.lang.String">
@ -449,12 +447,12 @@
<select id="getMenuTreeByUserId" resultType="com.hisense.hiatmp.base.model.Menu">
select m.*
from menu m
left join role_operation_relation rm on m.id = rm.operationid
left join user_role_relation ur on rm.roleid = ur.roleid
left join role ro on ur.roleid = ro.roleid
left join operator u on u.nuserid = ur.nuserid
left join role_operation_relation rm on m.id = rm.operationid
left join user_role_relation ur on rm.roleid = ur.roleid
left join role ro on ur.roleid = ro.roleid
left join operator u on u.nuserid = ur.nuserid
where u.nuserid = #{userId, jdbcType=VARCHAR}
and m.del_flag!='1'
and m.del_flag!='1'
and m.version >0
order by m.order_id
</select>
@ -494,7 +492,7 @@
<update id="updateVisitTime">
update bda_operator_oauth
set visit_time = cast(current_timestamp(0) as timestamp without time zone)
where trim(oauthuserid)=#{oauthUserId, jdbcType=VARCHAR}
where trim(oauthuserid) = #{oauthUserId, jdbcType=VARCHAR}
</update>
<select id="getDepartmentListShort" resultType="com.hisense.hiatmp.model.common.DepartmentVO">
select t.*
@ -504,7 +502,7 @@
<select id="getMenuById" resultType="com.hisense.hiatmp.base.model.Menu">
select *
from menu m
where m.id =#{id}
where m.id = #{id}
</select>
</mapper>

@ -0,0 +1,69 @@
<?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.hisense.hiatmp.base.mapper.HighDangerMapper">
<select id="getStatusCounts" resultType="com.hisense.hiatmp.model.common.HighDangerBaseNum">
SELECT 'Unconfirmed' AS status, SUM(CASE WHEN hdb.status = '0' THEN 1 ELSE 0 END) AS count
FROM tht_hidden_danger_base hdb
LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count
LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid}
UNION ALL
SELECT 'UnderInvestigation' AS status, SUM(CASE WHEN hdb.status = '10' THEN 1 ELSE 0 END) AS count
FROM tht_hidden_danger_base hdb
LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count
LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid}
UNION ALL
SELECT 'InGovernance' AS status, SUM(CASE WHEN hdb.status = '20' THEN 1 ELSE 0 END) AS count
FROM tht_hidden_danger_base hdb
LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count
LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid}
UNION ALL
SELECT 'Tracking' AS status, SUM(CASE WHEN hdb.status = '30' THEN 1 ELSE 0 END) AS count
FROM tht_hidden_danger_base hdb
LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count
LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid}
UNION ALL
SELECT 'NonHazard' AS status, SUM(CASE WHEN hdb.status = '50' THEN 1 ELSE 0 END) AS count
FROM tht_hidden_danger_base hdb
LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id AND hdb.pc_count = hdr.pc_count
LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601' AND et.enumvalue = hdb.status
WHERE hdb.handle_dept = #{cdepartmentid}
</select>
<select id="getHigDangerDealt" resultType="com.hisense.hiatmp.model.common.HighDangerBase">
SELECT
*
FROM
tht_hidden_danger_base hdb
LEFT JOIN tht_hidden_danger_road hdr ON hdb.business_id = hdr.business_id
AND hdb.pc_count = hdr.pc_count
LEFT JOIN department dp ON hdb.handle_dept = dp.cdepartmentid
LEFT JOIN enum_type et ON et.ENUMTYPEID = '6601'
AND et.enumvalue = hdb.status
WHERE
hdb.handle_dept = #{cdepartmentid}
AND hdb.status = #{statuss}
</select>
</mapper>

@ -0,0 +1,11 @@
<?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.hisense.hiatmp.base.mapper.OperatorMapper">
<select id="getOperatorById" resultType="com.hisense.hiatmp.base.model.OperatorDTO">
select * from operator where nuserid = #{nuserid}
</select>
</mapper>

@ -15,9 +15,9 @@ spring:
#6.1管控平台数据库地址、账号、密码,根据项目现场进行修改
datasource:
primary:
jdbc-url: jdbc:postgresql://10.16.3.27:5432/hiatmpdb
username: hiatmp
password: hiatmp
jdbc-url: jdbc:postgresql://118.89.79.160:5432/postgres
username: postgres
password: postgres123
# 下面为数据库连接池相关参数,一般不需修改
driver-class-name: org.postgresql.Driver
type: com.alibaba.druid.pool.DruidDataSource

@ -4,80 +4,72 @@
<mapper namespace="com.hisense.hiatmp.base.mapper.CommonMapper">
<insert id="saveVmsExecute" parameterType="com.hisense.hiatmp.model.pis.VmsExecute">
insert into PIS_VMS_EXECUTE (
ID,
DEVICE_ID,
RELEASE_TIME_START,
RELEASE_TIME_END,
ELEMENT_ID,
PLAN_ID,
ORDER_ID,
CASE_ID,
warn_Time
)
values (
#{id,jdbcType=VARCHAR},
#{deviceId,jdbcType=VARCHAR},
#{releaseTimeStart,jdbcType=TIMESTAMP},
#{releaseTimeEnd,jdbcType=TIMESTAMP},
#{elementId,jdbcType=VARCHAR},
#{planId,jdbcType=VARCHAR},
#{orderId,jdbcType=VARCHAR},
#{caseId,jdbcType=VARCHAR},
#{warnTime,jdbcType=VARCHAR}
)
insert into PIS_VMS_EXECUTE (ID,
DEVICE_ID,
RELEASE_TIME_START,
RELEASE_TIME_END,
ELEMENT_ID,
PLAN_ID,
ORDER_ID,
CASE_ID,
warn_Time)
values (#{id,jdbcType=VARCHAR},
#{deviceId,jdbcType=VARCHAR},
#{releaseTimeStart,jdbcType=TIMESTAMP},
#{releaseTimeEnd,jdbcType=TIMESTAMP},
#{elementId,jdbcType=VARCHAR},
#{planId,jdbcType=VARCHAR},
#{orderId,jdbcType=VARCHAR},
#{caseId,jdbcType=VARCHAR},
#{warnTime,jdbcType=VARCHAR})
</insert>
<insert id="saveLoginLog">
insert into LOG_DATA (
NID,
LOGTYPE,
USERID,
CARDID,
USERNAME,
DEPARTMENTNAME,
DEPARTMENTID,
LOGTIME,
CLIENTIP,
CLIENTID,
OPERATETYPE,
FAILCODE,
OPERATETARGET,
OPERATECONTENT,
SYSTEMID,
FIRSTMENUID,
SECONDMENUID,
FUNCTIONID,
FUNCTIONNAME
)
values (
#{nid,jdbcType=VARCHAR},
#{logtype,jdbcType=VARCHAR},
#{userid,jdbcType=VARCHAR},
#{cardid,jdbcType=VARCHAR},
#{username,jdbcType=VARCHAR},
#{departmentname,jdbcType=VARCHAR},
#{departmentid,jdbcType=VARCHAR},
#{logtime,jdbcType=TIMESTAMP},
#{clientip,jdbcType=VARCHAR},
#{clientid,jdbcType=VARCHAR},
#{operatetype,jdbcType=VARCHAR},
#{failcode,jdbcType=VARCHAR},
#{operatetarget,jdbcType=VARCHAR},
#{operatecontent,jdbcType=VARCHAR},
#{systemid,jdbcType=VARCHAR},
#{firstmenuid,jdbcType=TIMESTAMP},
#{secondmenuid,jdbcType=VARCHAR},
#{functionid,jdbcType=VARCHAR},
#{functionname,jdbcType=VARCHAR}
)
insert into LOG_DATA (NID,
LOGTYPE,
USERID,
CARDID,
USERNAME,
DEPARTMENTNAME,
DEPARTMENTID,
LOGTIME,
CLIENTIP,
CLIENTID,
OPERATETYPE,
FAILCODE,
OPERATETARGET,
OPERATECONTENT,
SYSTEMID,
FIRSTMENUID,
SECONDMENUID,
FUNCTIONID,
FUNCTIONNAME)
values (#{nid,jdbcType=VARCHAR},
#{logtype,jdbcType=VARCHAR},
#{userid,jdbcType=VARCHAR},
#{cardid,jdbcType=VARCHAR},
#{username,jdbcType=VARCHAR},
#{departmentname,jdbcType=VARCHAR},
#{departmentid,jdbcType=VARCHAR},
#{logtime,jdbcType=TIMESTAMP},
#{clientip,jdbcType=VARCHAR},
#{clientid,jdbcType=VARCHAR},
#{operatetype,jdbcType=VARCHAR},
#{failcode,jdbcType=VARCHAR},
#{operatetarget,jdbcType=VARCHAR},
#{operatecontent,jdbcType=VARCHAR},
#{systemid,jdbcType=VARCHAR},
#{firstmenuid,jdbcType=TIMESTAMP},
#{secondmenuid,jdbcType=VARCHAR},
#{functionid,jdbcType=VARCHAR},
#{functionname,jdbcType=VARCHAR})
</insert>
<delete id="deleteVmsExecute">
delete from PIS_VMS_Execute p where p.device_id = #{deviceId,jdbcType=VARCHAR}
delete
from PIS_VMS_Execute p
where p.device_id = #{deviceId,jdbcType=VARCHAR}
</delete>
@ -100,9 +92,9 @@
<select id="getPostName" resultType="String">
select enumname
from enum_type e
join pic_post_role_relation r on r.post_type = e.enumvalue
join pic_post_role_relation r on r.post_type = e.enumvalue
where e.enumtypeid = '20000'
and r.role_id = #{postId}
and r.role_id = #{postId}
</select>
@ -114,13 +106,18 @@
<select id="queryEquip" parameterType="java.lang.String" resultType="java.util.Map">
${sqlStr}
</select>
<!-- <select id="getDepartmentList" resultType="com.hisense.hiatmp.model.common.Department">-->
<!-- select t.*, d.coordinate, f.coordinate as coordinateCenter-->
<!-- from department t-->
<!-- left join district d-->
<!-- on d.dept_id = t.cdepartmentid-->
<!-- left join face_district_center f-->
<!-- on f.area_dept_id = d.dept_id-->
<!-- order by t.cdepartmentcode asc-->
<!-- </select>-->
<select id="getDepartmentList" resultType="com.hisense.hiatmp.model.common.Department">
select t.*, d.coordinate, f.coordinate as coordinateCenter
select t.* as coordinateCenter
from department t
left join district d
on d.dept_id = t.cdepartmentid
left join face_district_center f
on f.area_dept_id = d.dept_id
order by t.cdepartmentcode asc
</select>
<select id="getDepartmentListByLevel" resultType="com.hisense.hiatmp.model.common.Department">
@ -155,15 +152,14 @@
<select id="getOperationList" parameterType="java.lang.String" resultType="String">
SELECT DISTINCT ROR.OPERATIONID
FROM USER_ROLE_RELATION URR
LEFT JOIN ROLE_OPERATION_RELATION ROR ON ROR.ROLEID = URR.ROLEID
LEFT JOIN ROLE_OPERATION_RELATION ROR ON ROR.ROLEID = URR.ROLEID
WHERE URR.NUSERID = #{userId}
</select>
<select id="getOperationIdList" parameterType="java.lang.String" resultType="String">
select distinct orel.operationid
from role_operation_relation orel
where orel.roleid in (
SELECT t.roleid FROM USER_ROLE_RELATION t where t.nuserid = #{userId, jdbcType=VARCHAR})
and orel.operationid = #{operationId, jdbcType=VARCHAR}
where orel.roleid in (SELECT t.roleid FROM USER_ROLE_RELATION t where t.nuserid = #{userId, jdbcType=VARCHAR})
and orel.operationid = #{operationId, jdbcType=VARCHAR}
</select>
<select id="getHolidayList" resultType="com.hisense.hiatmp.model.common.HolidayDrop">
select t.holiday_id as holidayId,
@ -335,40 +331,39 @@
</select>
<select id="getGpsList" resultType="com.hisense.hiatmp.base.model.GpsDevice">
select *
from (select ROW_NUMBER() OVER(PARTITION BY g.CVEHID ORDER BY g.DTRECORDTIME DESC) num,
g.cvehid,
g.nvehalarm,
g.dtrecordtime,
g.decarlong as longitude,
g.decarlat as latitude,
g.ncarstatus,
g.nvehspeed,
g.ndirection,
g.datauploadtime,
g.datasavetime,
g.policeid,
g.mdsid,
g.reportstatus,
g.source,
e.thirdsyscode,
e.deviceid,
e.devicename,
e.gpstype,
e.gpsradiono,
et.enumname as gpstypename
from gps_data g
left join equipment_info e
on e.thirdsyscode = g.cvehid
left join (select enumname, enumvalue
from enum_type
where enumtypeid = '734') et
on et.enumvalue = e.gpstype
where g.dtrecordtime >=
sysdate -
(select nvl2(param.paramvalue, param.paramvalue, '5')
from (select t.paramvalue
from sysparams t
where t.paramcode = 'GPS_ONLINE_TIME_INTERVAL') param) / 1440) tt
from (select ROW_NUMBER() OVER(PARTITION BY g.CVEHID ORDER BY g.DTRECORDTIME DESC) num, g.cvehid,
g.nvehalarm,
g.dtrecordtime,
g.decarlong as longitude,
g.decarlat as latitude,
g.ncarstatus,
g.nvehspeed,
g.ndirection,
g.datauploadtime,
g.datasavetime,
g.policeid,
g.mdsid,
g.reportstatus,
g.source,
e.thirdsyscode,
e.deviceid,
e.devicename,
e.gpstype,
e.gpsradiono,
et.enumname as gpstypename
from gps_data g
left join equipment_info e
on e.thirdsyscode = g.cvehid
left join (select enumname, enumvalue
from enum_type
where enumtypeid = '734') et
on et.enumvalue = e.gpstype
where g.dtrecordtime >=
sysdate -
(select nvl2(param.paramvalue, param.paramvalue, '5')
from (select t.paramvalue
from sysparams t
where t.paramcode = 'GPS_ONLINE_TIME_INTERVAL') param) / 1440) tt
where tt.num = 1;
</select>
<select id="getPoliceList" resultType="com.hisense.hiatmp.model.common.Police">
@ -378,19 +373,20 @@
</select>
<select id="getAllDepartmentAreaList" resultType="com.hisense.hiatmp.base.model.District">
select ID,
DEPT_ID,
DISTRICT_CODE,
DISTRICT_NAME,
COORDINATE,
REMARK,
SHORT_NAME,
COLOR,
COLORSHOW
DEPT_ID,
DISTRICT_CODE,
DISTRICT_NAME,
COORDINATE,
REMARK,
SHORT_NAME,
COLOR,
COLORSHOW
from DISTRICT
</select>
<select id="getPresetListByThirdCode" resultType="java.util.Map">
SELECT DISTINCT t.presetid as "presetId", t.presetname as "presetName"
FROM equip_video_preset t join equipment_info e on e.deviceid=t.deviceid
FROM equip_video_preset t
join equipment_info e on e.deviceid = t.deviceid
WHERE e.thirdsyscode = #{thirdsyscode,jdbcType=VARCHAR}
order by t.presetname
</select>
@ -433,12 +429,14 @@
</select>
<insert id="insertBindOperator" parameterType="com.hisense.hiatmp.base.model.BindOperatorDTO">
insert into bda_operator_oauth(oauthuserid, nuserid, oauthtype,xm,sfzh,policeid,dwdm,dwmc,zw, bind_time,visit_time)
insert into bda_operator_oauth(oauthuserid, nuserid, oauthtype, xm, sfzh, policeid, dwdm, dwmc, zw, bind_time,
visit_time)
values (#{oauthUserId, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR}, #{oauthType, jdbcType=VARCHAR},
#{xm, jdbcType=VARCHAR}, #{sfzh, jdbcType=VARCHAR}, #{policeId, jdbcType=VARCHAR},
#{dwdm, jdbcType=VARCHAR}, #{dwmc, jdbcType=VARCHAR}, #{zw, jdbcType=VARCHAR},cast(current_timestamp(0) as
timestamp without time zone)
,cast(current_timestamp(0) as timestamp without time zone))
#{xm, jdbcType=VARCHAR}, #{sfzh, jdbcType=VARCHAR}, #{policeId, jdbcType=VARCHAR},
#{dwdm, jdbcType=VARCHAR}, #{dwmc, jdbcType=VARCHAR}, #{zw, jdbcType=VARCHAR},
cast(current_timestamp(0) as
timestamp without time zone)
, cast(current_timestamp(0) as timestamp without time zone))
</insert>
<select id="getUserPwd" resultType="java.lang.String">
@ -449,12 +447,12 @@
<select id="getMenuTreeByUserId" resultType="com.hisense.hiatmp.base.model.Menu">
select m.*
from menu m
left join role_operation_relation rm on m.id = rm.operationid
left join user_role_relation ur on rm.roleid = ur.roleid
left join role ro on ur.roleid = ro.roleid
left join operator u on u.nuserid = ur.nuserid
left join role_operation_relation rm on m.id = rm.operationid
left join user_role_relation ur on rm.roleid = ur.roleid
left join role ro on ur.roleid = ro.roleid
left join operator u on u.nuserid = ur.nuserid
where u.nuserid = #{userId, jdbcType=VARCHAR}
and m.del_flag!='1'
and m.del_flag!='1'
and m.version >0
order by m.order_id
</select>
@ -494,7 +492,7 @@
<update id="updateVisitTime">
update bda_operator_oauth
set visit_time = cast(current_timestamp(0) as timestamp without time zone)
where trim(oauthuserid)=#{oauthUserId, jdbcType=VARCHAR}
where trim(oauthuserid) = #{oauthUserId, jdbcType=VARCHAR}
</update>
<select id="getDepartmentListShort" resultType="com.hisense.hiatmp.model.common.DepartmentVO">
select t.*
@ -504,7 +502,7 @@
<select id="getMenuById" resultType="com.hisense.hiatmp.base.model.Menu">
select *
from menu m
where m.id =#{id}
where m.id = #{id}
</select>
</mapper>

@ -13,6 +13,8 @@ import java.util.Map;
@Repository
public interface CommonUserMapper {
List<Operator> getAllOperator();
List<Operator> getUserInfo(@Param("userId") String userId);
List<Department> getDeptInfo(@Param("deptId") String deptId);

@ -15,6 +15,10 @@ import java.util.Map;
/*@Transactional(rollbackFor = Exception.class)I*/
public interface ICommonUserService {
// 获取当前用户
List<Operator> getAllOperator();
// 获取当前用户
Operator getCurrentUser(String userId);
Department getDeptById(String deptId);

@ -27,8 +27,26 @@ import java.util.stream.Collectors;
public class CommonUserServiceImpl implements ICommonUserService {
@Autowired
private CommonUserMapper commonUserMapper;
private static Logger logger = LoggerFactory.getLogger(CommonUserServiceImpl.class);
@Override
public List<Operator> getAllOperator() {
List<Operator> result = null;
// log.info("CommonUserServiceImpl::::userId=" + userId);
try {
List<Operator> resultList = commonUserMapper.getAllOperator();
if (null != resultList && !resultList.isEmpty()) {
result = resultList;
}
// log.info("CommonUserServiceImpl::::Operator=" + String.valueOf(result));
} catch (Exception e) {
e.printStackTrace();
}
return result;
}
@Override
public Operator getCurrentUser(String userId) {
Operator result = null;

@ -172,4 +172,9 @@
FROM
DEPARTMENT T)
</select>
<select id="getAllOperator" resultType="com.hisense.hiatmp.model.common.Operator">
select *
from operator t
</select>
</mapper>

@ -172,4 +172,9 @@
FROM
DEPARTMENT T)
</select>
<select id="getAllOperator" resultType="com.hisense.hiatmp.model.common.Operator">
select *
from operator t
</select>
</mapper>

@ -1,5 +1,5 @@
server:
port: 1990
port: 1949
servlet:
context-path: /HiatmpPro
spring:
@ -8,7 +8,7 @@ spring:
cloud:
nacos:
discovery:
server-addr: 10.16.3.178:8848
server-addr: 10.16.3.179:8848,10.16.1.56:8848,10.16.3.152:8848
#server-addr: localhost:8848
gateway:
routes:
@ -28,16 +28,6 @@ spring:
order: 100000
predicates:
- Path=/HiatmpPro/hiface/**
# 地图图层
- id: maplayer
uri: lb://urbantraffic-hiatmp-dao-maplayer
predicates:
- Path=/HiatmpPro/maplayer/**
# 执法驾驶舱
- id: cockpit
uri: lb://urbantraffic-hiatmp-cockpit
predicates:
- Path=/HiatmpPro/cockpit/**
# 情报指挥
- id: pis
uri: lb://urbantraffic-hiatmp-service-piszz
@ -89,7 +79,7 @@ spring:
- Path=/HiatmpPro/vmsmqp/**
sso:
#是否开启sso权限验证
active: false
active: true
cookie-key: HiATMP-sso-id
cookie-max-age: -1
#回跳地址 后台ip+端口
@ -103,16 +93,12 @@ sso:
#登出method
logout-path: logout
#忽略sso路径
ignore-ends: .js,.png,insertBindOperator,getBindOperator
ignore-ends: .js,.png
#是否接收CAS server控制用户在线状态
accept-sso-update: true
#防钓鱼
anti-phishing:
active: false
accept: http\://10.16.1.72,http\://172.29.96.29,http\://172.29.77.241
sso-maoming:
active: true
active: false
sso-kunming:
active: false
danao-url: http://53.102.96.11:8888

@ -0,0 +1,166 @@
package com.hisense.hiatmp.model.common;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@Data
public class HighDangerBase implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
/**
* nid
*/
private String nid;
/**
* business_id
*/
private String businessId;
/**
* name
*/
private String name;
/**
* type
*/
private String type;
/**
* source
*/
private String source;
/**
* find_way
*/
private String findWay;
/**
* area
*/
private String area;
/**
* status
*/
private String status;
/**
* find_time
*/
private String findTime;
/**
* operator
*/
private String operator;
/**
* insert_time
*/
private String insertTime;
/**
* pc_start_time
*/
private String pcStartTime;
/**
* pc_end_time
*/
private String pcEndTime;
/**
* zl_start_time
*/
private String zlStartTime;
/**
* zl_end_time
*/
private String zlEndTime;
/**
* gz_start_time
*/
private String gzStartTime;
/**
* gz_end_time
*/
private String gzEndTime;
/**
* report_dept
*/
private String reportDept;
/**
* handle_dept
*/
private String handleDept;
/**
* delay_status
*/
private String delayStatus;
/**
* delay_count
*/
private String delayCount;
/**
* delay_day
*/
private String delayDay;
/**
* pc_count
*/
private String pcCount;
/**
* split_id
*/
private String splitId;
/**
* risk_hd_desc
*/
private String riskHdDesc;
/**
* road_condition
*/
private String roadCondition;
/**
* fa_start_time
*/
private String faStartTime;
/**
* fa_end_time
*/
private String faEndTime;
/**
* approve_status
*/
private String approveStatus;
/**
* last_mod_date
*/
private String lastModDate;
}

@ -0,0 +1,43 @@
package com.hisense.hiatmp.model.common;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@Data
public class HighDangerBaseNum implements Serializable {
private static final long serialVersionUID = -8763233643579533472L;
private String status;
private int count;
// Getters and Setters
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public int getCount() {
return count;
}
public void setCount(int count) {
this.count = count;
}
// // 用户警号
// private String unconfirmedCount;
// // 用户名称
// private String underInvestigationCount;
//
// private String inGovernanceCount;
//
// private String trackingCount;
//
// private String nonHazardCount;
}

@ -1,10 +1,10 @@
package com.hisense.hiatmp.model.common;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@Data
public class Operator implements Serializable {
private static final long serialVersionUID = -8763233643579533470L;
@ -12,6 +12,10 @@ public class Operator implements Serializable {
private String nuserid;
// 用户名称
private String cusername;
// 用户密码
@JsonIgnore
private String cuserpwd;
// 客户端ip
private String ip;
private String cdescription;

@ -45,7 +45,7 @@
<easypoi.version>4.4.0</easypoi.version>
<spring.configuration.version>2.1.4.RELEASE</spring.configuration.version>
<spring.context.version>5.1.6.RELEASE</spring.context.version>
<!-- <mybatis.version>3.5.2</mybatis.version>-->
<mybatis.version>3.5.2</mybatis.version>
<jasypt.version>2.1.0</jasypt.version>
<snakeyaml.version>1.23</snakeyaml.version>
<bootadmin.version>2.2.2</bootadmin.version>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -36,3 +36,53 @@
2024-07-09 08:01:33,655 [RMI TCP Connection(2)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
2024-07-09 08:05:09,312 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
2024-07-09 08:05:09,316 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
2024-07-09 08:05:14,191 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Starting AdminServerMain on Lyblue_mc with PID 32680 (D:\DEV\Code\highDanger\urbantraffic-parent\hiatmp-admin-server\target\classes started by 云曦 in D:\DEV\Code\highDanger\urbantraffic-parent)
2024-07-09 08:05:14,197 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - No active profile set, falling back to default profiles: default
2024-07-09 08:05:15,089 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-31002"]
2024-07-09 08:05:15,090 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-09 08:05:15,090 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.33]
2024-07-09 08:05:15,171 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2024-07-09 08:05:16,057 [main] WARN com.baomidou.mybatisplus.core.metadata.TableInfoHelper - Can not find table primary key in Class: "com.hisense.hiatmp.adminServer.entity.User".
2024-07-09 08:05:16,064 [main] WARN com.baomidou.mybatisplus.core.injector.DefaultSqlInjector - class com.hisense.hiatmp.adminServer.entity.User ,Not found @TableId annotation, Cannot use Mybatis-Plus 'xxById' Method.
2024-07-09 08:05:16,976 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-31002"]
2024-07-09 08:05:16,995 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Started AdminServerMain in 3.068 seconds (JVM running for 4.117)
2024-07-09 08:05:17,402 [RMI TCP Connection(1)-192.168.3.52] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2024-07-09 08:05:17,404 [RMI TCP Connection(2)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
2024-07-09 08:05:18,038 [RMI TCP Connection(2)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
2024-07-09 09:54:37,673 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
2024-07-09 09:54:37,677 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
2024-07-09 09:54:43,804 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Starting AdminServerMain on Lyblue_mc with PID 16264 (D:\DEV\Code\highDanger\urbantraffic-parent\hiatmp-admin-server\target\classes started by 云曦 in D:\DEV\Code\highDanger\urbantraffic-parent)
2024-07-09 09:54:43,812 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - No active profile set, falling back to default profiles: default
2024-07-09 09:54:44,759 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-31002"]
2024-07-09 09:54:44,760 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-09 09:54:44,760 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.33]
2024-07-09 09:54:44,822 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2024-07-09 09:54:46,466 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-31002"]
2024-07-09 09:54:46,493 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Started AdminServerMain in 2.96 seconds (JVM running for 4.043)
2024-07-09 09:54:46,892 [RMI TCP Connection(3)-192.168.3.52] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2024-07-09 09:54:46,893 [RMI TCP Connection(4)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
2024-07-09 09:54:47,617 [RMI TCP Connection(4)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
2024-07-09 09:55:01,575 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
2024-07-09 09:55:01,580 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
2024-07-09 09:55:04,511 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Starting AdminServerMain on Lyblue_mc with PID 14496 (D:\DEV\Code\highDanger\urbantraffic-parent\hiatmp-admin-server\target\classes started by 云曦 in D:\DEV\Code\highDanger\urbantraffic-parent)
2024-07-09 09:55:04,519 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - No active profile set, falling back to default profiles: default
2024-07-09 09:55:05,409 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-31002"]
2024-07-09 09:55:05,410 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-09 09:55:05,410 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.33]
2024-07-09 09:55:05,470 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2024-07-09 09:55:06,995 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-31002"]
2024-07-09 09:55:07,012 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Started AdminServerMain in 2.788 seconds (JVM running for 4.005)
2024-07-09 09:55:08,203 [RMI TCP Connection(7)-192.168.3.52] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2024-07-09 09:55:08,204 [RMI TCP Connection(6)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
2024-07-09 09:55:08,895 [RMI TCP Connection(6)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
2024-07-09 11:22:13,990 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
2024-07-09 11:22:13,998 [SpringContextShutdownHook] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
2024-07-09 13:32:49,651 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Starting AdminServerMain on Lyblue_mc with PID 5728 (D:\DEV\Code\highDanger\urbantraffic-parent\hiatmp-admin-server\target\classes started by 云曦 in D:\DEV\Code\highDanger\urbantraffic-parent)
2024-07-09 13:32:49,659 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - No active profile set, falling back to default profiles: default
2024-07-09 13:32:50,809 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-31002"]
2024-07-09 13:32:50,809 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-09 13:32:50,810 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.33]
2024-07-09 13:32:50,900 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2024-07-09 13:32:52,243 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-31002"]
2024-07-09 13:32:52,262 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Started AdminServerMain in 2.982 seconds (JVM running for 4.353)
2024-07-09 13:32:52,678 [RMI TCP Connection(4)-192.168.3.52] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'

@ -1,13 +1,81 @@
2024-07-09 08:05:14,191 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Starting AdminServerMain on Lyblue_mc with PID 32680 (D:\DEV\Code\highDanger\urbantraffic-parent\hiatmp-admin-server\target\classes started by 云曦 in D:\DEV\Code\highDanger\urbantraffic-parent)
2024-07-09 08:05:14,197 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - No active profile set, falling back to default profiles: default
2024-07-09 08:05:15,089 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-31002"]
2024-07-09 08:05:15,090 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-09 08:05:15,090 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.33]
2024-07-09 08:05:15,171 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
2024-07-09 08:05:16,057 [main] WARN com.baomidou.mybatisplus.core.metadata.TableInfoHelper - Can not find table primary key in Class: "com.hisense.hiatmp.adminServer.entity.User".
2024-07-09 08:05:16,064 [main] WARN com.baomidou.mybatisplus.core.injector.DefaultSqlInjector - class com.hisense.hiatmp.adminServer.entity.User ,Not found @TableId annotation, Cannot use Mybatis-Plus 'xxById' Method.
2024-07-09 08:05:16,976 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-31002"]
2024-07-09 08:05:16,995 [main] INFO com.hisense.hiatmp.adminServer.AdminServerMain - Started AdminServerMain in 3.068 seconds (JVM running for 4.117)
2024-07-09 08:05:17,402 [RMI TCP Connection(1)-192.168.3.52] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2024-07-09 08:05:17,404 [RMI TCP Connection(2)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
2024-07-09 08:05:18,038 [RMI TCP Connection(2)-192.168.3.52] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
2024-07-09 17:30:27,249 [main] INFO com.alibaba.boot.nacos.config.util.NacosConfigPropertiesUtils - nacosConfigProperties : NacosConfigProperties{serverAddr='127.0.0.1:8848', contextPath='null', encode='null', endpoint='null', namespace='null', accessKey='null', secretKey='null', ramRoleName='null', autoRefresh=false, dataId='null', dataIds='null', group='DEFAULT_GROUP', type=null, maxRetry='null', configLongPollTimeout='null', configRetryTime='null', enableRemoteSyncConfig=false, extConfig=[], bootstrap=Bootstrap{enable=false, logEnable=false}}
2024-07-09 17:30:27,255 [main] INFO com.alibaba.boot.nacos.config.autoconfigure.NacosConfigApplicationContextInitializer - [Nacos Config Boot] : The preload configuration is not enabled
2024-07-09 17:30:27,489 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesBeanFactoryPostProcessor - Post-processing PropertySource instances
2024-07-09 17:30:27,538 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
2024-07-09 17:30:27,539 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource bootstrap [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:27,539 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:27,539 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:27,540 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
2024-07-09 17:30:27,540 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:27,575 [main] INFO com.ulisesbocchio.jasyptspringboot.filter.DefaultLazyPropertyFilter - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
2024-07-09 17:30:27,595 [main] INFO com.ulisesbocchio.jasyptspringboot.resolver.DefaultLazyPropertyResolver - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
2024-07-09 17:30:27,597 [main] INFO com.ulisesbocchio.jasyptspringboot.detector.DefaultLazyPropertyDetector - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
2024-07-09 17:30:28,093 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesConfiguration - Bootstraping jasypt-string-boot auto configuration in context: application-1
2024-07-09 17:30:28,093 [main] INFO com.alibaba.boot.nacos.config.util.NacosConfigPropertiesUtils - nacosConfigProperties : NacosConfigProperties{serverAddr='127.0.0.1:8848', contextPath='null', encode='null', endpoint='null', namespace='null', accessKey='null', secretKey='null', ramRoleName='null', autoRefresh=false, dataId='null', dataIds='null', group='DEFAULT_GROUP', type=null, maxRetry='null', configLongPollTimeout='null', configRetryTime='null', enableRemoteSyncConfig=false, extConfig=[], bootstrap=Bootstrap{enable=false, logEnable=false}}
2024-07-09 17:30:28,094 [main] INFO com.alibaba.boot.nacos.config.autoconfigure.NacosConfigApplicationContextInitializer - [Nacos Config Boot] : The preload configuration is not enabled
2024-07-09 17:30:28,094 [main] INFO com.hisense.hiatmp.base.BaseApplication - No active profile set, falling back to default profiles: default
2024-07-09 17:30:29,492 [main] INFO com.ulisesbocchio.jasyptspringboot.configuration.EnableEncryptablePropertiesBeanFactoryPostProcessor - Post-processing PropertySource instances
2024-07-09 17:30:29,509 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource servletConfigInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource servletContextInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource applicationConfig: [classpath:/application.properties] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource applicationConfig: [classpath:/application.yml] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:29,510 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:29,511 [main] INFO com.ulisesbocchio.jasyptspringboot.EncryptablePropertySourceConverter - Converting PropertySource defaultProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
2024-07-09 17:30:29,552 [main] INFO com.ulisesbocchio.jasyptspringboot.filter.DefaultLazyPropertyFilter - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
2024-07-09 17:30:29,836 [main] INFO com.ulisesbocchio.jasyptspringboot.resolver.DefaultLazyPropertyResolver - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
2024-07-09 17:30:29,838 [main] INFO com.ulisesbocchio.jasyptspringboot.detector.DefaultLazyPropertyDetector - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
2024-07-09 17:30:30,187 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-1959"]
2024-07-09 17:30:30,198 [main] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat]
2024-07-09 17:30:30,200 [main] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.17]
2024-07-09 17:30:30,373 [main] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/HiatmpPro/commond] - Initializing Spring embedded WebApplicationContext
2024-07-09 17:30:30,546 [main] INFO com.hisense.hiatmp.common.config.DataSourceConfig - 第一数据库连接池创建中.......
2024-07-09 17:30:32,846 [main] INFO springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping - Mapped URL path [/v2/api-docs] onto method [public org.springframework.http.ResponseEntity<springfox.documentation.spring.web.json.Json> springfox.documentation.swagger2.web.Swagger2Controller.getDocumentation(java.lang.String,javax.servlet.http.HttpServletRequest)]
2024-07-09 17:30:32,917 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2024-07-09 17:30:32,918 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2024-07-09 17:30:32,925 [main] WARN com.netflix.config.sources.URLConfigurationSource - No URLs will be polled as dynamic configuration sources.
2024-07-09 17:30:32,925 [main] INFO com.netflix.config.sources.URLConfigurationSource - To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
2024-07-09 17:30:35,595 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper - Context refreshed
2024-07-09 17:30:35,639 [main] INFO springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper - Found 1 custom documentation plugin(s)
2024-07-09 17:30:35,724 [main] INFO springfox.documentation.spring.web.scanners.ApiListingReferenceScanner - Scanning for api listing references
2024-07-09 17:30:36,179 [main] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-1959"]
2024-07-09 17:30:36,709 [http-nio-1959-exec-2] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/HiatmpPro/commond] - Initializing Spring DispatcherServlet 'dispatcherServlet'
2024-07-09 17:30:36,845 [http-nio-1959-exec-2] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
2024-07-09 17:30:37,760 [http-nio-1959-exec-2] INFO com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
2024-07-09 17:30:39,456 [main] ERROR com.alibaba.cloud.nacos.registry.NacosServiceRegistry - nacos registry, urbantraffic-hiatmp-base register failed...NacosRegistration{nacosDiscoveryProperties=NacosDiscoveryProperties{serverAddr='10.16.3.178:8848', endpoint='', namespace='', watchDelay=30000, logName='', service='urbantraffic-hiatmp-base', weight=1.0, clusterName='DEFAULT', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD}, registerEnabled=true, ip='192.168.64.1', networkInterface='', port=1959, secure=false, accessKey='', secretKey=''}},
java.lang.IllegalStateException: failed to req API:/nacos/v1/ns/instance after all servers([10.16.3.178:8848]) tried: failed to req API:10.16.3.178:8848/nacos/v1/ns/instance. code:500 msg: java.net.SocketTimeoutException: connect timed out
at com.alibaba.nacos.client.naming.net.NamingProxy.reqAPI(NamingProxy.java:464) ~[nacos-client-1.1.1.jar:?]
at com.alibaba.nacos.client.naming.net.NamingProxy.reqAPI(NamingProxy.java:386) ~[nacos-client-1.1.1.jar:?]
at com.alibaba.nacos.client.naming.net.NamingProxy.registerService(NamingProxy.java:188) ~[nacos-client-1.1.1.jar:?]
at com.alibaba.nacos.client.naming.NacosNamingService.registerInstance(NacosNamingService.java:205) ~[nacos-client-1.1.1.jar:?]
at com.alibaba.nacos.client.naming.NacosNamingService.registerInstance(NacosNamingService.java:184) ~[nacos-client-1.1.1.jar:?]
at com.alibaba.cloud.nacos.registry.NacosServiceRegistry.register(NacosServiceRegistry.java:61) [spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar:2.1.0.RELEASE]
at org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration.register(AbstractAutoServiceRegistration.java:239) [spring-cloud-commons-2.1.1.RELEASE.jar:2.1.1.RELEASE]
at com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration.register(NacosAutoServiceRegistration.java:74) [spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar:2.1.0.RELEASE]
at org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration.start(AbstractAutoServiceRegistration.java:138) [spring-cloud-commons-2.1.1.RELEASE.jar:2.1.1.RELEASE]
at org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration.bind(AbstractAutoServiceRegistration.java:101) [spring-cloud-commons-2.1.1.RELEASE.jar:2.1.1.RELEASE]
at org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration.onApplicationEvent(AbstractAutoServiceRegistration.java:88) [spring-cloud-commons-2.1.1.RELEASE.jar:2.1.1.RELEASE]
at org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration.onApplicationEvent(AbstractAutoServiceRegistration.java:47) [spring-cloud-commons-2.1.1.RELEASE.jar:2.1.1.RELEASE]
at org.springframework.context.event.SimpleApplicationEventMulticaster.doInvokeListener(SimpleApplicationEventMulticaster.java:172) [spring-context-5.1.6.RELEASE.jar:5.1.6.RELEASE]
at org.springframework.context.event.SimpleApplicationEventMulticaster.invokeListener(SimpleApplicationEventMulticaster.java:165) [spring-context-5.1.6.RELEASE.jar:5.1.6.RELEASE]
at org.springframework.context.event.SimpleApplicationEventMulticaster.multicastEvent(SimpleApplicationEventMulticaster.java:139) [spring-context-5.1.6.RELEASE.jar:5.1.6.RELEASE]
at org.springframework.context.support.AbstractApplicationContext.publishEvent(AbstractApplicationContext.java:402) [spring-context-5.1.6.RELEASE.jar:5.1.6.RELEASE]
at org.springframework.context.support.AbstractApplicationContext.publishEvent(AbstractApplicationContext.java:359) [spring-context-5.1.6.RELEASE.jar:5.1.6.RELEASE]
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:166) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:552) [spring-context-5.1.6.RELEASE.jar:5.1.6.RELEASE]
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:142) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:775) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:316) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1260) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1248) [spring-boot-2.1.4.RELEASE.jar:2.1.4.RELEASE]
at com.hisense.hiatmp.base.BaseApplication.main(BaseApplication.java:19) [classes/:?]
2024-07-09 17:30:39,462 [main] INFO com.hisense.hiatmp.base.BaseApplication - Started BaseApplication in 12.818 seconds (JVM running for 14.431)
2024-07-09 17:30:39,464 [main] INFO com.hisense.hiatmp.common.encrypt.EncryptedDetector - ==============配置项自动加密已触发============
2024-07-09 17:30:39,464 [main] INFO com.hisense.hiatmp.common.encrypt.EncryptedDetector - ==============配置项自动加密已结束,未用脚本启动或者yml参数未配置正确,加密失败!============
2024-07-09 17:31:01,929 [http-nio-1959-exec-4] INFO com.hisense.hiatmp.common.controller.HiatmpController - HiatmpController:::user id is: admin1
2024-07-09 17:31:05,484 [http-nio-1959-exec-4] INFO com.hisense.hiatmp.common.service.impl.CommonUserServiceImpl - CommonUserServiceImpl::::userId=admin1
2024-07-09 17:31:05,536 [http-nio-1959-exec-4] INFO com.hisense.hiatmp.common.service.impl.CommonUserServiceImpl - CommonUserServiceImpl::::Operator=Operator(nuserid=admin1, cusername=管理员, cuserpwd=101830814915fa66ec21741baacb0db76d14ecb8f0083c4b21148808bd55401bb15ed71584a986b5e69af33383142ab79a448e8171b4d73f1b429311dd3e66e9, ip=null, cdescription=320924197006030018, phone=1501112111, cdepartmentid=370200000000)

File diff suppressed because it is too large Load Diff

@ -4,12 +4,9 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.6.RELEASE</version>
<version>2.1.4.RELEASE</version>
<relativePath/>
</parent>
<modules>
<module>hiatmp-api-server</module>
</modules>
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
@ -41,7 +38,6 @@
<mysql-connector-java.version>5.1.46</mysql-connector-java.version>
<org.apache.poi.version>4.0.1</org.apache.poi.version>
<easypoi.version>4.4.0</easypoi.version>
<!-- <lombok.version>1.18.6</lombok.version>-->
<!-- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -->
</properties>
@ -93,11 +89,11 @@
<artifactId>mapper-core</artifactId>
<version>${mapper-core.version}</version>
</dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.mybatis</groupId>-->
<!-- <artifactId>mybatis</artifactId>-->
<!-- <version>${mybatis.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc</artifactId>
@ -263,12 +259,6 @@
<artifactId>jetcache-redis</artifactId>
<version>${jetcache.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.projectlombok</groupId>-->
<!-- <artifactId>lombok</artifactId>-->
<!-- <version>${lombok.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>

Loading…
Cancel
Save