0714问题修改

master
Zangzhipeng 1 year ago
parent 9d302e22e7
commit 8f6a3ec4e4
  1. 9
      hiatmp-base/src/main/java/com/hisense/hiatmp/server_api/service/AuthService.java
  2. 24
      hiatmp-base/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java
  3. 10
      hiatmp-base/src/main/java/com/hisense/hiatmp/server_api/service/OperatorService.java
  4. 32
      hiatmp-base/src/main/java/com/hisense/hiatmp/server_api/service/impl/AuthServiceImpl.java
  5. 144
      hiatmp-base/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java
  6. 19
      hiatmp-base/src/main/java/com/hisense/hiatmp/server_api/service/impl/OperatorServiceImpl.java
  7. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/BaseApplication.class
  8. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/config/FeignConfig.class
  9. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/config/RedisConfig.class
  10. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/config/SwaggerConfig.class
  11. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/constant/CommonConstant.class
  12. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/controller/CommonController.class
  13. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/controller/ConfigController.class
  14. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/feign/LogFeign.class
  15. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/mapper/CommonMapper.class
  16. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/mapper/ConfigMapper.class
  17. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/BindOperatorDTO.class
  18. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/District.class
  19. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/DistrictInfo.class
  20. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/GpsDevice.class
  21. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/LogDataDTO.class
  22. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/Menu.class
  23. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/ModuleCustomConfig.class
  24. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/model/SocialDeptCenter.class
  25. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/ICommonService.class
  26. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/IConfigService.class
  27. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/IMapQueryService.class
  28. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/impl/CommonServiceImpl$1.class
  29. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/impl/CommonServiceImpl.class
  30. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/impl/ConfigServiceImpl.class
  31. BIN
      hiatmp-base/target/classes/com/hisense/hiatmp/base/service/impl/MapQueryService.class
  32. 18
      hiatmp-base/target/classes/sql-mapper/CommonMapper.xml
  33. 2
      hiatmp-base/target/classes/sql-mapper/ConfigMapper.xml
  34. 2
      hiatmp-hidden-danger-server/pom.xml
  35. 4
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/AuthController.java
  36. 273
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
  37. 25
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java
  38. 2
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/OperatorMapper.java
  39. 4
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java
  40. 9
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java
  41. 135
      hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
  42. 2
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/CrossingDTO.java
  43. 11
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerBase.java
  44. 79
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/HighDangerRoad.java
  45. 20
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ManualInvestigation.java
  46. 17
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/SectionDTO.java
  47. 19
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/SectionOrCrossAdd.java
  48. 24
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/SectionVO.java
  49. 87
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDangerRoadInfo.java
  50. 46
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtHiddenDataCollectConfigExtra.java
  51. 1
      hiatmp-parent/pom.xml
  52. 12239
      log/error.log
  53. 19872
      log/info.log

@ -1,9 +0,0 @@
package com.hisense.hiatmp.server_api.service;
import org.springframework.stereotype.Service;
@Service
public interface AuthService {
public String encrypt(String input);
}

@ -1,24 +0,0 @@
package com.hisense.hiatmp.server_api.service;
import com.hisense.hiatmp.model.common.ThtDangerItems;
import com.hisense.hiatmp.model.dmr.Point;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
@Service
public interface HighDangerService {
List<Map<String, String>> getHighDangerStatusNum(String nuserid);
Double getPointDistance(Point point1,Point point2);
Map<String, Double> sortByValue(Map<String, Double> unsortedMap);
List<ThtDangerItems> listWithTree();
List<Path> saveMultipartFiles(List<MultipartFile> multipartFiles);
}

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

@ -1,32 +0,0 @@
package com.hisense.hiatmp.server_api.service.impl;
import com.hisense.hiatmp.server_api.service.AuthService;
import org.springframework.stereotype.Service;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@Service
public class AuthServiceImpl implements AuthService {
@Override
public String encrypt(String input) {
try {
MessageDigest digest = MessageDigest.getInstance("SHA-512");
byte[] hash = digest.digest(input.getBytes());
StringBuilder hexString = new StringBuilder();
for (byte b : hash) {
String hex = Integer.toHexString(0xff & b);
if (hex.length() == 1) {
hexString.append('0');
}
hexString.append(hex);
}
return hexString.toString();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
return null;
}
}
}

@ -1,144 +0,0 @@
package com.hisense.hiatmp.server_api.service.impl;
import com.hisense.hiatmp.server_api.mapper.HighDangerMapper;
import com.hisense.hiatmp.server_api.service.HighDangerService;
import com.hisense.hiatmp.model.common.ThtDangerItems;
import com.hisense.hiatmp.model.dmr.Point;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class HighDangerBaseServiceImpl implements HighDangerService {
@Value("${file.path.local}")
private String fileLocalPath;
private static SimpleDateFormat sfFile = new SimpleDateFormat("yyyyMMddHHmmss");
@Autowired
private HighDangerMapper highDangerMapper;
@Override
public List<Map<String, String>> getHighDangerStatusNum(String nuserid) {
return Collections.emptyList();
}
// 两点之间的距离
@Override
public Double getPointDistance(Point point1, Point point2) {
double dx = point2.getX() - point1.getX();
double dy = point2.getY() - point1.getY();
return Math.sqrt(dx * dx + dy * dy);
}
// 实现按照 Map 值排序的方法
public Map<String, Double> sortByValue(Map<String, Double> unsortedMap) {
// 将 Map 转换为 List,然后排序
List<Map.Entry<String, Double>> list = new LinkedList<>(unsortedMap.entrySet());
// 使用 Collections.sort() 方法,传入比较器 Comparator
Collections.sort(list, new Comparator<Map.Entry<String, Double>>() {
public int compare(Map.Entry<String, Double> o1, Map.Entry<String, Double> o2) {
return Double.compare(o1.getValue(), o2.getValue());
}
});
// 将排序后的键值对重新放入一个新的 LinkedHashMap 中
// 保留了插入顺序,也可以使用 TreeMap 等其他类型的 Map
Map<String, Double> sortedMap = new LinkedHashMap<>();
for (Map.Entry<String, Double> entry : list) {
sortedMap.put(entry.getKey(), entry.getValue());
}
return sortedMap;
}
/*
递归查找
*/
@Override
public List<ThtDangerItems> listWithTree(){
List<ThtDangerItems> dangerItems = highDangerMapper.getDangerItems();
List<ThtDangerItems> dangerItemResult = dangerItems.stream().map(items -> {
ThtDangerItems dangerItemVO = new ThtDangerItems();
BeanUtils.copyProperties(items, dangerItemVO);
return dangerItemVO;
}).collect(Collectors.toList());
List<ThtDangerItems> list = dangerItemResult.stream().filter(items ->
items.getParentid()==null || items.getParentid().isEmpty()
).map((menu)->{
menu.setChildren(getChildrenData(menu,dangerItemResult));
return menu;
}).collect(Collectors.toList());
return list;
}
private List<ThtDangerItems> getChildrenData(ThtDangerItems root, List<ThtDangerItems> all) {
List<ThtDangerItems> children = all.stream().filter(items ->
root.getId().equals(items.getParentid())
).map(item -> {
item.setChildren(getChildrenData(item,all));
return item;
}).collect(Collectors.toList());
return children;
}
// 保存图片
@Override
public List<Path> saveMultipartFiles(List<MultipartFile> multipartFiles) {
ArrayList<Path> paths = new ArrayList<>();
if(multipartFiles!= null &&!multipartFiles.isEmpty()){
for (MultipartFile multipartFile : multipartFiles) {
// 保存图片
try {
boolean add = paths.add(handleFileSave(fileLocalPath, multipartFile));
if(add){
continue;
}else{
throw new RuntimeException("图片保存失败");
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}
return paths;
}
public static Path handleFileSave(String localPath, MultipartFile file) throws Exception {
// 处理传来的文件
String name = file.getOriginalFilename();
String saveName = "file-" + sfFile.format(new Date()) + UUID.randomUUID().toString().substring(0, 4) + name.substring(name.lastIndexOf("."));
File saveFile = new File(localPath + saveName);
file.transferTo(saveFile);
return saveFile.toPath();
// 判断文件是否是图片类型
// Path path = saveFile.toPath();
// String type = Files.probeContentType(path);
// if (Files.probeContentType(saveFile.toPath()) != null) {
// return new FileSaveDTO(name, saveName, Files.probeContentType(saveFile.toPath()).startsWith("image/"));
// } else {
// return new FileSaveDTO(name, saveName, false);
// }
}
}

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

@ -196,7 +196,7 @@
WHERE t.deviceid = #{deviceId,jdbcType=VARCHAR}
</select>
<select id="getAreaList" resultType="com.hisense.hiatmp.base.model.AreaContent">
<select id="getAreaList" resultType="com.hisense.hiatmp.server_api.model.AreaContent">
select f.AREA_ID "areacode", f.AREA_NAME, f.COORDINATES, f.AREA_TYPE "areaType", d.COORDINATE "coordinateCenter"
from face_area f
left join face_district_center d
@ -211,7 +211,7 @@
</foreach>
</if>
</select>
<select id="getSocialDeptCenterList" resultType="com.hisense.hiatmp.base.model.SocialDeptCenter">
<select id="getSocialDeptCenterList" resultType="com.hisense.hiatmp.server_api.model.SocialDeptCenter">
select ID,
SOCIAL_DEPT_ID,
COORDINATE,
@ -291,7 +291,7 @@
</otherwise>
</choose>
</select>
<select id="getAreaByCoordinate" resultType="com.hisense.hiatmp.base.model.DistrictInfo">
<select id="getAreaByCoordinate" resultType="com.hisense.hiatmp.server_api.model.DistrictInfo">
<choose>
<when test="dataBase != null and dataBase != '' and dataBase == '1'.toString()">
SELECT M
@ -329,7 +329,7 @@
</otherwise>
</choose>
</select>
<select id="getGpsList" resultType="com.hisense.hiatmp.base.model.GpsDevice">
<select id="getGpsList" resultType="com.hisense.hiatmp.server_api.model.GpsDevice">
select *
from (select ROW_NUMBER() OVER(PARTITION BY g.CVEHID ORDER BY g.DTRECORDTIME DESC) num, g.cvehid,
g.nvehalarm,
@ -371,7 +371,7 @@
from police p
where p.isclosed = '1'
</select>
<select id="getAllDepartmentAreaList" resultType="com.hisense.hiatmp.base.model.District">
<select id="getAllDepartmentAreaList" resultType="com.hisense.hiatmp.server_api.model.District">
select ID,
DEPT_ID,
DISTRICT_CODE,
@ -428,7 +428,7 @@
where t.oauthuserid = #{oauthUserId, jdbcType=VARCHAR}
</select>
<insert id="insertBindOperator" parameterType="com.hisense.hiatmp.base.model.BindOperatorDTO">
<insert id="insertBindOperator" parameterType="com.hisense.hiatmp.server_api.model.BindOperatorDTO">
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},
@ -444,7 +444,7 @@
from operator
where trim(nuserid) = #{userId, jdbcType=VARCHAR}
</select>
<select id="getMenuTreeByUserId" resultType="com.hisense.hiatmp.base.model.Menu">
<select id="getMenuTreeByUserId" resultType="com.hisense.hiatmp.server_api.model.Menu">
select m.*
from menu m
left join role_operation_relation rm on m.id = rm.operationid
@ -456,7 +456,7 @@
and m.version >0
order by m.order_id
</select>
<select id="getAllMenus" resultType="com.hisense.hiatmp.base.model.Menu">
<select id="getAllMenus" resultType="com.hisense.hiatmp.server_api.model.Menu">
select *
from menu m
</select>
@ -499,7 +499,7 @@
from department t
order by t.cdepartmentcode asc
</select>
<select id="getMenuById" resultType="com.hisense.hiatmp.base.model.Menu">
<select id="getMenuById" resultType="com.hisense.hiatmp.server_api.model.Menu">
select *
from menu m
where m.id = #{id}

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hisense.hiatmp.base.mapper.ConfigMapper">
<select id="getModuleCustomConfigList" resultType="com.hisense.hiatmp.base.model.ModuleCustomConfig">
<select id="getModuleCustomConfigList" resultType="com.hisense.hiatmp.server_api.model.ModuleCustomConfig">
select * from module_custom_config
</select>

@ -169,7 +169,7 @@
</dependencies>
<build>
<finalName>hiatmp-base</finalName>
<finalName>hiatmp-hidden-danger-server</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

@ -38,7 +38,7 @@ public class AuthController {
String encrypt = authService.encrypt(operator.getCuserpwd()+ operator.getCusername());
if (operatorById.getCusername().equals(operator.getCusername()) && operatorById.getCuserpwd().equals(encrypt)) {
// String token = JwtUtil.createToken(operatorById);
return ServerResponse.ok(operatorById.getNuserid());
return ServerResponse.ok("登录成功",operatorById.getNuserid());
}
}else{
return ServerResponse.error("用户不存在");
@ -61,7 +61,7 @@ public class AuthController {
// 执行修改操作并返回结果,返回修改的,如果为null,表示修改失败
String rowsAffected = operatorMapper.updateByPrimaryKeySelective(operatorById.getCusername(), operatorById.getCuserpwd());
if(rowsAffected != null){
return ServerResponse.ok("<" + operatorById.getCusername() + ">用户密码修改成功");
return ServerResponse.ok("<" + operatorById.getCusername() + ">用户密码修改成功", cusername);
}else{
return ServerResponse.error("修改失败");
}

@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@RestController
@ -34,9 +34,9 @@ public class HighDangerController {
// 查询各个状态的数据情况
@GetMapping("/getHighDangerStatusNum")
public ServerResponse<?> getHighStatusNum(@RequestParam String cusername){
public ServerResponse<?> getHighStatusNum(@RequestParam String nuserid){
String cdepartmentid = null;
Operator operatorById = operatorMapper.getOperatorById(cusername);
Operator operatorById = operatorMapper.getOperatorById(nuserid);
if(operatorById != null){
cdepartmentid = operatorById.getCdepartmentid();
}else{
@ -55,7 +55,7 @@ public class HighDangerController {
@RequestParam(defaultValue = "10") Integer pageSize){
String cdepartmentid = null;
// 获取当前操作的对象,用于查找对应的部门
Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getCusername());
Operator operatorById = operatorMapper.getOperatorById(highDangerBaseVO.getNuserid());
if(operatorById != null){
cdepartmentid = operatorById.getCdepartmentid();
}else{
@ -80,15 +80,19 @@ public class HighDangerController {
if(comparison < 0) { // 超期
base.setDeadline(diffDays);
base.setDeadlineStatus("超期" + diffDays + "天");
base.setDeadlineType("1");
} else if(comparison > 0 && diffDays <= 3) { // 临期
base.setDeadline(diffDays);
base.setDeadlineStatus("临期" + diffDays + "天");
base.setDeadlineType("2");
} else { // 正常
base.setDeadline(diffDays);
base.setDeadlineStatus("正常");
base.setDeadlineType("3");
}
}else{
base.setDeadlineStatus("无排查结束时间");
base.setDeadlineType("3");
}
}
PageInfo<HighDangerBase> pageInfo = new PageInfo<>(statusCounts);
@ -143,32 +147,41 @@ public class HighDangerController {
}
// 获取全部道路
@GetMapping("/getAllRoadInfo")
@GetMapping("/getAllSection")
public ServerResponse<?> getAllRoad(){
List<BisRoadDTO> allRoadInfo = highDangerMapper.getAllRoadInfo();
List<SectionVO> allSection = highDangerMapper.getAllSection();
return ServerResponse.ok(allRoadInfo);
return ServerResponse.ok(allSection);
}
// 获取最近道路
@PostMapping("/getNearRoadInfo")
public ServerResponse<?> getNearRoad(@RequestBody Point point){
public ServerResponse<?> getNearRoad(@RequestBody Point point,
@RequestParam(defaultValue = "1") Long pageNum,
@RequestParam(defaultValue = "10") Long pageSize){
// 获取全部路段数据
List<BisRoadDTO> allRoadInfo = highDangerMapper.getAllRoadInfo();
HashMap<String, Double> pointMap = new HashMap<>();
List<SectionVO> allRoadInfo = highDangerMapper.getAllSection();
HashMap<String, Map<Double, String>> combinedMap = new HashMap<>();
HashMap<String, Map<Double, String>> pointMapSection = new HashMap<>();
HashMap<String, Map<Double, String>> pointMapCrossing = new HashMap<>();
Point Dpoint = new Point();
// 遍历所有路段
for(BisRoadDTO dto : allRoadInfo){
for(SectionVO dto : allRoadInfo){
Map<Double,String> map = new HashMap<>();
// 临时存储最短距离
Double minDistance = null;
if(dto.getPosition() == null){
continue;
}
// 将单条路段的坐标点依次取出进行对比
String[] split = dto.getPosition().split(",");
for(int i = 0; i < split.length; i += 2){
float x = Float.parseFloat(split[i]);
float y = Float.parseFloat(split[i + 1]);
Point Dpoint = new Point();
Dpoint.setX(x);
Dpoint.setY(y);
// 计算两点间的距离
@ -183,25 +196,78 @@ public class HighDangerController {
}
}
}
map.put(minDistance, dto.getPosition());
// 将路段和最短路线
pointMap.put(dto.getRoadName(), minDistance);
pointMapSection.put(dto.getSectionName(), map);
minDistance = null;
}
// 将路段根据计算的值进行排序
Map<String, Double> sortedMap = highDangerService.sortByValue(pointMap);
if(sortedMap != null){
return ServerResponse.ok(sortedMap);
}else{
return ServerResponse.error("未查询到最近道路");
// 获取所有路口信息
List<CrossingDTO> allCrossing = highDangerMapper.getAllCrossing();
// 遍历集合,将所有坐标点与当前坐标比较
for(CrossingDTO cross : allCrossing){
Map<Double,String> map = new HashMap<>();
float x = cross.getLongitude();
float y = cross.getLatitude();
Dpoint.setX(x);
Dpoint.setY(y);
// 计算两点间的距离
Double pointDistance = highDangerService.getPointDistance(Dpoint, point);
map.put(pointDistance, String.valueOf(cross.getLongitude() + cross.getLatitude()));
pointMapCrossing.put(cross.getCrossingName(), map);
}
// return ServerResponse.ok(sortedMap);
combinedMap.putAll(pointMapSection);
combinedMap.putAll(pointMapCrossing);
// Map<String, Map<Double,String>> collectPage = combinedMap.entrySet().stream()
// .skip((pageNum - 1) * pageSize)
// .limit(pageSize)
// .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
// 将路段根据计算的值进行排序
LinkedHashMap<String, Map<Double, String>> collect = highDangerService.sortMapByValue(combinedMap).entrySet().stream()
.skip((pageNum - 1) * pageSize)
.limit(pageSize)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
return ServerResponse.ok(collect);
}
// 查询当前排查所在路段
@GetMapping("/getDangerRoad")
public ServerResponse<?> getDangerRoad(@RequestParam String businessId){
List<BisRoadVO> roadInfo = highDangerMapper.getRoadInfo(businessId);
HighDangerRoad roadInfo = highDangerMapper.getRoadInfo(businessId);
Date nowDate = new Date();
Date pcEndTime = roadInfo.getPcEndTime();
if(pcEndTime != null){
long diff = nowDate.getTime() - pcEndTime.getTime();
// 时间差
long diffDays = diff / (24 * 60 * 60 * 1000);
diffDays = Math.abs(diffDays);
int comparison = nowDate.compareTo(pcEndTime);
if(comparison < 0) { // 超期
roadInfo.setDeadline(diffDays);
roadInfo.setDeadlineStatus("超期" + diffDays + "天");
roadInfo.setDeadlineType("1");
} else if(comparison > 0 && diffDays <= 3) { // 临期
roadInfo.setDeadline(diffDays);
roadInfo.setDeadlineStatus("临期" + diffDays + "天");
roadInfo.setDeadlineType("2");
} else { // 正常
roadInfo.setDeadline(diffDays);
roadInfo.setDeadlineStatus("正常");
roadInfo.setDeadlineType("3");
}
}else{
roadInfo.setDeadlineStatus("无排查结束时间");
roadInfo.setDeadlineType("3");
}
if(roadInfo != null){
return ServerResponse.ok(roadInfo);
}else {
@ -223,34 +289,67 @@ public class HighDangerController {
}
// 新增路段
@PostMapping("/saveRoad")
public ServerResponse<?> saveRoad(@RequestBody SectionDTO sectionDTO){
@PostMapping("/saveSectionOrCrossing")
public ServerResponse<?> saveRoad(@RequestBody SectionOrCrossAdd sectionOrCrossAdd){
// 随机生成一个16位的数作为路段id
Random random = new Random();
long randomNumber = (long) (random.nextDouble() * 9000000000000000L) + 1000000000000000L;
String section = highDangerMapper.saveRoad(String.valueOf(randomNumber), sectionDTO.getSectionName(), sectionDTO.getUpCrossingCode(), sectionDTO.getDownCrossingCode());
if(section != null && !section.isEmpty()){
return ServerResponse.ok(section);
}else {
return ServerResponse.error("新增路段失败");
// Random random = new Random();
// long sectionCode = (long) (random.nextDouble() * 9000000000000000L) + 1000000000000000L;
// long roadCode = (long) (random.nextDouble() * 90000000000L) + 10000000000L;
//
// sectionVO.setSectionCode(String.valueOf(sectionCode));
// sectionVO.setRoadCode(String.valueOf(roadCode));
if("1".equals(sectionOrCrossAdd.getAddType())){
// 插入路段表
int i = highDangerMapper.saveSection(sectionOrCrossAdd);
if(i > 0){
return ServerResponse.ok("道路新增成功");
} else {
return ServerResponse.error("道路新增失败");
}
}
else if("2".equals(sectionOrCrossAdd.getAddType())){
int i = highDangerMapper.saveCrossing(sectionOrCrossAdd);
if(i > 0){
return ServerResponse.ok("道路新增成功");
} else {
return ServerResponse.error("道路新增失败");
}
}else{
return ServerResponse.error("新增类型错误");
}
// 将新增的路段绑定到隐患表当中
// highDangerMapper.bindRoad(sectionVO.getSectionCode(),sectionVO.getBusinessId());
// 新增道路信息表
// BisRoadDTO bisRoadDTO = new BisRoadDTO();
// bisRoadDTO.setRoadCode(String.valueOf(roadCode));
// bisRoadDTO.setRoadName(sectionVO.getSectionName());
// bisRoadDTO.setPosition("0");
// highDangerMapper.saveRoad(bisRoadDTO);
// if(section != null){
// return ServerResponse.ok("道路新增成功",section);
// }else{
// return ServerResponse.error("道路新增失败");
// }
}
// 新增路口
@PostMapping("/saveCrossing")
public ServerResponse<?> saveCrossing(@RequestBody CrossingDTO crossingDTO){
Random random = new Random();
long randomNumber = (long) (random.nextDouble() * 9000000000000000L) + 1000000000000000L;
String crossing = highDangerMapper.saveCrossing(String.valueOf(randomNumber), crossingDTO.getCrossingName(), crossingDTO.getLongitude(), crossingDTO.getLatitude());
if(crossing != null && crossing != ""){
return ServerResponse.ok(crossing);
}else {
return ServerResponse.error("新增路口失败");
}
}
// @PostMapping("/saveCrossing")
// public ServerResponse<?> saveCrossing(@RequestBody CrossingDTO crossingDTO){
//
//
//// Random random = new Random();
//// long randomNumber = (long) (random.nextDouble() * 9000000000000000L) + 1000000000000000L;
//// String crossing = highDangerMapper.saveCrossing(String.valueOf(randomNumber), crossingDTO.getCrossingName(), crossingDTO.getLongitude(), crossingDTO.getLatitude());
// if(crossing != null && crossing != ""){
// return ServerResponse.ok(crossing);
// }else {
// return ServerResponse.error("新增路口失败");
// }
// }
// 重点排查二级页面信息
@GetMapping("/getImportDangerInfo")
@ -313,6 +412,25 @@ public class HighDangerController {
}
}
@GetMapping("/getImportDangerDisplay")
public ServerResponse<?> getImportDangerDisplay(@RequestParam String businessId){
List<ImportDangerDTO> item = highDangerMapper.getImportDangerDisplayItem(businessId);
if(item != null){
return ServerResponse.ok(item);
} else {
return ServerResponse.error("无存在问题数据");
}
}
@GetMapping("/getImportDangerDisplayDetail")
public ServerResponse<?> getImportDangerDisplayDetail(@RequestParam String businessId){
List<ThtHiddenDataCollectConfigExtra> importDangerList = highDangerMapper.getImportDangerDisplay(businessId);
if(importDangerList != null){
return ServerResponse.ok(importDangerList);
} else {
return ServerResponse.error("无存在问题数据");
}
}
// 保存 & 暂存人工排查
@Transactional
@ -340,36 +458,44 @@ public class HighDangerController {
// 保存统计数据(步骤2)
highDangerMapper.insertSectionTraffic(manualInvestigation);
}
Set<String> keys = Collections.emptySet();
HighDangerBase higDangerDetail = highDangerMapper.getHigDangerDetail(manualInvestigation.getBusinessId());
String pcCount = higDangerDetail.getPcCount();
manualInvestigation.setPcCount(pcCount);
// 先删除二级页面数据
highDangerMapper.deleteHiddenDataCollectConfigByBusinessId(manualInvestigation.getBusinessId());
highDangerMapper.deleteThtHiddenDataCollectConfigExtra(manualInvestigation.getBusinessId());
for(ThtHiddenDataCollectConfigExtra extra : manualInvestigation.getExtraConfigs()){
extra.setPcCount(pcCount);
extra.setBusinessId(manualInvestigation.getBusinessId());
highDangerMapper.saveThtHiddenDataCollectConfigExtra(extra);
}
// 保存隐患排查二级页面数据
for (Map<String,List<ThtHiddenDataCollectConfig>> map: manualInvestigation.getKeyInvestigation()){
keys = map.keySet();
for (Map.Entry<String, List<ThtHiddenDataCollectConfig>> entry : map.entrySet()) {
String key = entry.getKey();
// 对key和value进行操作
for (ThtHiddenDataCollectConfig config : entry.getValue()) {
// // 保存图片
// List<MultipartFile> multipartFiles1 = config.getMultipartFiles1();
// // 图片路径集合(来车方向1)
// String path1 = highDangerService.saveMultipartFiles(multipartFiles1).toString();
//
// List<MultipartFile> multipartFiles2 = config.getMultipartFiles1();
// // 图片路径集合(来车方向2)
// String path2 = highDangerService.saveMultipartFiles(multipartFiles2).toString();
// for (Map<String,List<ThtHiddenDataCollectConfig>> map: manualInvestigation.getKeyInvestigation()){
// keys = map.keySet();
// for (Map.Entry<String, List<ThtHiddenDataCollectConfig>> entry : map.entrySet()) {
// String key = entry.getKey();
// // 对key和value进行操作
// for (ThtHiddenDataCollectConfig config : entry.getValue()) {
//// // 保存图片
//// List<MultipartFile> multipartFiles1 = config.getMultipartFiles1();
//// // 图片路径集合(来车方向1)
//// String path1 = highDangerService.saveMultipartFiles(multipartFiles1).toString();
////
//// List<MultipartFile> multipartFiles2 = config.getMultipartFiles1();
//// // 图片路径集合(来车方向2)
//// String path2 = highDangerService.saveMultipartFiles(multipartFiles2).toString();
////
//// config.setPic1Address(path1);
//// config.setPic2Address(path2);
// config.setBusinessId(manualInvestigation.getBusinessId());
//
// config.setPic1Address(path1);
// config.setPic2Address(path2);
config.setBusinessId(manualInvestigation.getBusinessId());
// 插入重点排查二级页面数据
highDangerMapper.saveHiddenDataCollectConfig(config);
}
}
}
// // 插入重点排查二级页面数据
// highDangerMapper.saveHiddenDataCollectConfig(config);
// }
// }
// }
// // 保存重点排查数据
// highDangerMapper.saveDangerExtra(manualInvestigation);
@ -384,11 +510,16 @@ public class HighDangerController {
// // 图片上传
// return ServerResponse.ok();
// }
manualInvestigation.setKeySet(keys.toString());
// manualInvestigation.setKeySet(keys.toString());
// 随机生成UUID
UUID uuid = UUID.randomUUID();
String uuidString = uuid.toString().replace("-", "");
manualInvestigation.setNid(uuidString);
// 隐患排查表--如果存在该记录则更新
if(highDangerMapper.isExtraExistence(manualInvestigation.getBusinessId()) != null){
highDangerMapper.updateDangerExtra(manualInvestigation);
highDangerMapper.deleteRoadInfo(manualInvestigation.getBusinessId());
}else{
// 保存重点排查数据
highDangerMapper.saveDangerExtra(manualInvestigation);
@ -399,7 +530,7 @@ public class HighDangerController {
highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "99");
return ServerResponse.ok("数据已暂存",manualInvestigation);
}else{
highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "30");
highDangerMapper.updateTemporary(manualInvestigation.getBusinessId(), "20");
return ServerResponse.ok("数据已保存",manualInvestigation);
}

@ -24,15 +24,21 @@ public interface HighDangerMapper extends BaseMapper<HighDangerBase>{
List<HighDangerBase> getHigDangerSearch(String search);
List<BisRoadDTO> getAllRoadInfo();
List<SectionVO> getAllSection();
List<BisRoadVO> getRoadInfo(String businessId);
List<CrossingDTO> getAllCrossing();
HighDangerRoad getRoadInfo(String businessId);
List<ImportDangerDTO> getImportDanger();
String saveRoad(String sectionCode, String sectionName, String upCrossingCode, String downCrossingCode);
int saveSection(SectionOrCrossAdd sectionOrCrossAdd);
void saveRoad(BisRoadDTO bisRoadDTO);
String saveCrossing(String crossingCode, String crossingName,Float longitude, Float latitude);
void bindRoad(String sectionCode, String businessId);
int saveCrossing(SectionOrCrossAdd sectionOrCrossAdd);
List<ImportDangerInfoDTO> getImportDangerInfo(String sid);
@ -60,9 +66,16 @@ public interface HighDangerMapper extends BaseMapper<HighDangerBase>{
ThtHiddenDangerExtra isExtraExistence(String bussinessId);
void updateDangerExtra(ManualInvestigation manualInvestigation);
void deleteRoadInfo(String businessId);
void deleteThtHiddenDataCollectConfigExtra(String businessId);
void saveThtHiddenDataCollectConfigExtra(ThtHiddenDataCollectConfigExtra extra);
List<ThtHiddenDataCollectConfigExtra> getImportDangerDisplay(String businessId);
List<ImportDangerDTO> getImportDangerDisplayItem(String businessId);
void deleteHiddenDataCollectConfigByBusinessId(String businessId);
}

@ -11,7 +11,7 @@ public interface OperatorMapper {
List<Operator> getAllOperator();
Operator getOperatorById(@Param("cusername") String cusername);
Operator getOperatorById(@Param("nusername") String nusername);
String updateByPrimaryKeySelective(@Param("cusername") String cusername,@Param("cuserpwd") String cuserpwd);
}

@ -17,11 +17,13 @@ public interface HighDangerService {
Double getPointDistance(Point point1,Point point2);
Map<String, Double> sortByValue(Map<String, Double> unsortedMap);
// Map<String, Double> sortByValue(Map<String, Double> unsortedMap);
List<ThtDangerItems> listWithTree();
String saveMultipartFiles(MultipartFile multipartFiles) throws IOException;
Boolean isPicture(MultipartFile file);
Map<String, Map<Double,String>> sortMapByValue(Map<String, Map<Double,String>> unsortedMap);
}

@ -191,4 +191,13 @@ public class HighDangerBaseServiceImpl implements HighDangerService {
// }
}
public Map<String, Map<Double,String>> sortMapByValue(Map<String, Map<Double,String>> unsortedMap) {
Map<String, Map<Double,String>> sortedMap = new LinkedHashMap<>();
Comparator<Double> valueComparator = Comparator.naturalOrder();
unsortedMap.entrySet().stream()
.sorted(Map.Entry.comparingByValue((o1, o2) -> valueComparator.compare(o1.keySet().iterator().next(), o2.keySet().iterator().next())))
.forEachOrdered(entry -> sortedMap.put(entry.getKey(), entry.getValue()));
return sortedMap;
}
}

@ -3,9 +3,7 @@
<mapper namespace="com.hisense.hiatmp.server_api.mapper.HighDangerMapper">
<delete id="deleteHiddenDataCollectConfigByBusinessId">
delete from tht_hidden_data_collect_config_extra where business_id = #{businessId}
</delete>
<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
@ -155,8 +153,9 @@
<select id="getHigDangerDetail" resultType="com.hisense.hiatmp.model.common.HighDangerBase">
SELECT *
SELECT DISTINCT hdb.*,hdr.coordinate, hdr.coordinate_type
FROM tht_hidden_danger_base hdb
left join tht_hidden_danger_road hdr on hdr.business_id = hdb.business_id
WHERE hdb.business_id = #{businessId}
</select>
@ -166,33 +165,33 @@
WHERE hdb.name like #{search}
</select>
<select id="getAllRoadInfo" resultType="com.hisense.hiatmp.model.common.BisRoadDTO">
SELECT road_code,
road_name,
road_standard_type,
road_adm_level,
road_type,
road_distance,
cre_user,
cre_date,
last_mod_user,
last_mod_date,
position,
road_status,
description,
transport_sys_code,
road_code_array
FROM bis_road br
where br.isactive = '1'
<select id="getAllSection" resultType="com.hisense.hiatmp.model.common.SectionVO">
SELECT
section_code,
section_name,
road_code,
width,
length,
area_code,
position
FROM bis_section
</select>
<select id="getRoadInfo" resultType="com.hisense.hiatmp.server_api.model.BisRoadVO">
SELECT DISTINCT br.*, bs.section_name, bs.section_code
FROM bis_section bs
JOIN bis_road br ON bs.road_code = br.road_code
JOIN tht_hidden_danger_road thd ON bs.section_code = thd.section_code
WHERE thd.business_id = #{businessId};
<select id="getAllCrossing" resultType="com.hisense.hiatmp.model.common.CrossingDTO">
SELECT
*
FROM bis_crossing
</select>
<select id="getRoadInfo" resultType="com.hisense.hiatmp.model.common.HighDangerRoad">
SELECT DISTINCT thdb.*, thdr.address, thdr.coordinate
from
tht_hidden_danger_base thdb
left join tht_hidden_danger_road thdr on thdr.business_id = thdb.business_id
where
thdb.business_id = #{businessId}
</select>
<select id="getImportDanger" resultType="com.hisense.hiatmp.model.common.ImportDangerDTO">
@ -200,16 +199,27 @@
from tht_hidden_scenes;
</select>
<select id="saveRoad" resultType="String">
insert into bis_section (section_code, section_name, up_crossing_code, down_crossing_code)
values (#{sectionCode}, #{sectionName}, #{upCrossingCode},
#{downCrossingCode}) RETURNING bis_section.section_code;
</select>
<update id="saveSection">
update tht_hidden_danger_road thdr
set
address = #{address},
coordinate = #{coordinate}
where business_id = #{businessId}
</update>
<select id="saveCrossing" resultType="String">
insert into bis_crossing (crossing_code, crossing_name, longitude, latitude)
values (#{crossingCode}, #{crossingName}, #{longitude}, #{latitude}) RETURNING bis_crossing.crossing_code;
</select>
<update id="bindRoad">
update tht_hidden_danger_road set
section_code = #{sectionCode}
where business_id = #{businessId};
</update>
<update id="saveCrossing">
update tht_hidden_danger_road thdr
set
address = #{address},
coordinate = #{coordinate}
where business_id = #{businessId}
</update>
<select id="getImportDangerInfo" resultType="com.hisense.hiatmp.model.common.ImportDangerInfoDTO">
SELECT b.*
@ -243,7 +253,7 @@
</select>
<select id="isExtraExistence" resultType="com.hisense.hiatmp.model.common.ThtHiddenDangerExtra">
SELECT * FROM tht_hidden_danger_extra where business_id = #{businessId}
SELECT * FROM tht_hidden_danger_road_info where business_id = #{businessId}
</select>
<insert id="insertSectionInfo">
@ -316,21 +326,42 @@
</insert>
<insert id="saveDangerExtra">
INSERT INTO tht_hidden_danger_extra (nid, key_investigation, danger_item, danger_desc, image_list, information,
business_id)
VALUES (nextval('test_id_seq3'), #{keySet}, #{dangerItem}, #{dangerDesc}, #{imageList},
#{information}, #{businessId})
INSERT INTO tht_hidden_danger_road_info (nid, business_id, big_category, small_category, hd_term, hd_desc,
pc_count,hd_pic,hd_info)
VALUES (#{nid}, #{businessId}, #{bigCategory}, #{smallCategory}, #{hdTerm},
#{hdDesc}, #{pcCount},#{hdPic},#{hdInfo})
</insert>
<update id="updateDangerExtra">
update tht_hidden_danger_extra
set
key_investigation = #{keySet},
danger_item = #{dangerItem},
danger_desc = #{dangerDesc},
image_list = #{imageList},
information = #{information}
where business_id = #{businessId}
</update>
<insert id="saveRoad">
insert into bis_road ("road_code","road_name","position") values(#{roadCode},#{roadName},#{position})
</insert>
<delete id="deleteRoadInfo">
delete from tht_hidden_danger_road_info where business_id = #{businessId}
</delete>
<delete id="deleteThtHiddenDataCollectConfigExtra">
delete from tht_hidden_data_collect_config_extra where business_id = #{businessId}
</delete>
<insert id="saveThtHiddenDataCollectConfigExtra">
insert into
tht_hidden_data_collect_config_extra
("nid","itemid","order","type","name","standar","unit","business_id","scenes_id","pc_count")
values
(nextval('test_id_seq2'),#{itemid},#{order},#{type},#{name},#{standar},#{unit},#{businessId},#{scenesId},#{pcCount})
</insert>
<select id="getImportDangerDisplay" resultType="com.hisense.hiatmp.model.common.ThtHiddenDataCollectConfigExtra">
select * from tht_hidden_data_collect_config_extra where business_id = #{businessId}
</select>
<select id="getImportDangerDisplayItem" resultType="com.hisense.hiatmp.model.common.ImportDangerDTO">
SELECT DISTINCT s.*
FROM tht_hidden_data_collect_config_extra e
INNER JOIN tht_hidden_scenes s ON e.scenes_id = s.nid
where e.business_id = #{businessId}
</select>
</mapper>

@ -9,7 +9,9 @@ public class CrossingDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String crossingCode;
private String crossingName;
private String area;
private Float longitude;
private Float latitude;
// private String description;

@ -172,4 +172,15 @@ public class HighDangerBase implements Serializable {
// 临期状态
private String deadlineStatus;
private String deadlineType;
// 路段坐标
private String coordinate;
// 地址类型
private String coordinateType;
// 画圆半径
private String radius;
}

@ -0,0 +1,79 @@
package com.hisense.hiatmp.model.common;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@Data
public class HighDangerRoad 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;
/**
* area
*/
private String area;
/**
* status
*/
private String status;
/**
* operator
*/
private String operator;
/**
* pc_start_time
*/
private String pcStartTime;
/**
* pc_end_time
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pcEndTime;
/**
* pc_count
*/
private String pcCount;
// 临期时间
private Long deadline;
// 临期状态
private String deadlineStatus;
private String deadlineType;
private String address;
// 路段坐标
private String coordinate;
// 地址类型
private String coordinateType;
}

@ -39,12 +39,20 @@ public class ManualInvestigation implements Serializable {
Date lastModeDate;
// 第三页,重点排查 & 存在隐患
List<Map<String, List<ThtHiddenDataCollectConfig>>> keyInvestigation;
String keySet;
String dangerItem;
String dangerDesc;
String imageList;
String information;
List<ThtHiddenDataCollectConfigExtra> extraConfigs;
private String nid;
private String pcCount;
private String bigCategory;
private String smallCategory;
private String hdTerm;
private String hdDesc;
private String zlUnit;
private String zlMeasure;
private Date wcTime;
private Date lastModDate;
private String hdPic;
private String hdInfo;
// 暂存标识 0暂存 1提交
Boolean temporary;

@ -1,17 +0,0 @@
package com.hisense.hiatmp.model.common;
import lombok.Data;
import java.io.Serializable;
@Data
public class SectionDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String sectionName;
private String upCrossingCode;
private String downCrossingCode;
// private String description;
}

@ -0,0 +1,19 @@
package com.hisense.hiatmp.model.common;
import lombok.Data;
import java.io.Serializable;
@Data
public class SectionOrCrossAdd implements Serializable {
private static final long serialVersionUID = 1L;
private String businessId;
private String address;
private String coordinate;
private String addType;
}

@ -0,0 +1,24 @@
package com.hisense.hiatmp.model.common;
import lombok.Data;
import java.io.Serializable;
@Data
public class SectionVO implements Serializable {
private static final long serialVersionUID = 1L;
private String sectionCode;
private String businessId;
private String roadCode;
private String sectionName;
private Float width;
private Float length;
private String area_code;
private String position;
// private String upCrossingCode;
// private String downCrossingCode;
// private String description;
}

@ -0,0 +1,87 @@
package com.hisense.hiatmp.model.common;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @description tht_hidden_danger_road_info
* @author BEJSON
* @date 2024-07-14
*/
@Data
public class ThtHiddenDangerRoadInfo implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
/**
* nid
*/
private String nid;
/**
* business_id
*/
private String businessId;
/**
* big_category
*/
private String bigCategory;
/**
* small_category
*/
private String smallCategory;
/**
* hd_term
*/
private String hdTerm;
/**
* hd_desc
*/
private String hdDesc;
/**
* pc_count
*/
private String pcCount;
/**
* zl_unit
*/
private String zlUnit;
/**
* zl_measure
*/
private String zlMeasure;
/**
* wc_time
*/
private Date wcTime;
/**
* last_mod_date
*/
private Date lastModDate;
/**
* hd_pic
*/
private String hdPic;
/**
* hd_info
*/
private String hdInfo;
public ThtHiddenDangerRoadInfo() {}
}

@ -0,0 +1,46 @@
package com.hisense.hiatmp.model.common;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
@Data
public class ThtHiddenDataCollectConfigExtra implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
private String nid;
private String itemid;
private int order;
private String type;
private String name;
private String standar;
private String unit;
private String businessId;
private String scenesId;
private String pcCount;
public ThtHiddenDataCollectConfigExtra() {}
}

@ -12,6 +12,7 @@
<module>../hiatmp-base</module>
<module>../hiatmp-model</module>
<module>../hiatmp-common</module>
<module>../hiatmp-hidden-danger-server</module>
</modules>
<artifactId>hiatmp-parent</artifactId>
<version>0.1.0-SNAPSHOT</version>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save