Commit 5cfc86f6 authored by suhuiguang's avatar suhuiguang

1.redis先修改为不同,原因两边序列化方式不一致

2.pom 依赖库整理 3.巡检app升级bug修改
parent a9fd265c
...@@ -42,7 +42,7 @@ public class RedisKey { ...@@ -42,7 +42,7 @@ public class RedisKey {
* @return String * @return String
*/ */
public static String buildReginKey(String userId, String token) { public static String buildReginKey(String userId, String token) {
return "region_" + userId + "_" + token; return "biz_" + userId + "_" + token;
} }
/** /**
......
...@@ -532,6 +532,7 @@ public class CheckController extends AbstractBaseController { ...@@ -532,6 +532,7 @@ public class CheckController extends AbstractBaseController {
return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList()); return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList());
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "/设备设施维保记录分页列表", notes = "外部接口装备和者水源使用") @ApiOperation(value = "/设备设施维保记录分页列表", notes = "外部接口装备和者水源使用")
@GetMapping(value = "page/{originalId}/list") @GetMapping(value = "page/{originalId}/list")
public ResponseModel getCheckListByOriginalId( public ResponseModel getCheckListByOriginalId(
......
...@@ -437,8 +437,8 @@ public class CheckServiceImpl implements ICheckService { ...@@ -437,8 +437,8 @@ public class CheckServiceImpl implements ICheckService {
List<DaoCriteria> criterias = new ArrayList<>(); List<DaoCriteria> criterias = new ArrayList<>();
DaoCriteria daoCriteria = new DaoCriteria(); DaoCriteria daoCriteria = new DaoCriteria();
daoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName()); daoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
daoCriteria.setPropertyName("originalId"); daoCriteria.setPropertyName("pointId");
daoCriteria.setValue(originalId); daoCriteria.setValue(point.getId());
criterias.add(daoCriteria); criterias.add(daoCriteria);
BaseQuerySpecification<Check> spec = new BaseQuerySpecification<>(criterias); BaseQuerySpecification<Check> spec = new BaseQuerySpecification<>(criterias);
Sort.Order idOrder = new Sort.Order(Sort.Direction.DESC, "id"); Sort.Order idOrder = new Sort.Order(Sort.Direction.DESC, "id");
......
...@@ -253,11 +253,12 @@ public class CheckServiceImpl implements ICheckService { ...@@ -253,11 +253,12 @@ public class CheckServiceImpl implements ICheckService {
check.setCheckTime(DateUtil.getLongDate(requestParam.getCheckTime())); check.setCheckTime(DateUtil.getLongDate(requestParam.getCheckTime()));
check.setUploadTime(new Date()); check.setUploadTime(new Date());
check.setOrgCode(requestParam.getOrgCode()); check.setOrgCode(requestParam.getOrgCode());
check.setUserId(user.getUserId().toString()); check.setUserId(user.getUserId());
check.setUserName(user.getRealName()); check.setUserName(user.getRealName());
// Department dep = user.getDepartment(); if (departmentModel != null && departmentModel.getSequenceNbr() != null) {
if (departmentModel != null) {
check.setDepId(departmentModel.getSequenceNbr().toString()); check.setDepId(departmentModel.getSequenceNbr().toString());
}
if (departmentModel != null) {
check.setDepName(departmentModel.getDepartmentName()); check.setDepName(departmentModel.getDepartmentName());
} }
check.setCheckMode(requestParam.getCheckMode()); check.setCheckMode(requestParam.getCheckMode());
......
...@@ -256,29 +256,15 @@ ...@@ -256,29 +256,15 @@
</dependencyManagement> </dependencyManagement>
<repositories> <repositories>
<repository> <repository>
<id>spring-snapshots</id> <id>Releases</id>
<url>http://172.16.1.6:8081/nexus/content/repositories/spring.io/</url> <name>Releases</name>
<url>http://172.16.1.6:8081/nexus/content/repositories/releases/</url>
</repository> </repository>
<repository> <repository>
<id>nexus</id> <id>Snapshots</id>
<name>Team Nexus Repository</name> <name>Snapshots</name>
<url>http://172.16.1.6:8081/nexus/content/groups/public</url> <url>http://172.16.1.6:8081/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<repository>
<id>maven-public</id>
<name>maven-public</name>
<url>http://172.16.1.6:8081/nexus/content/repositories/maven-public/</url>
</repository>
<!-- <repository> -->
<!-- <id>maven-public1</id> -->
<!-- <name>maven-public</name> -->
<!-- <url>http://repo.typroject.org:8081/repository/maven-public/</url> -->
<!-- </repository> -->
<!-- <repository> -->
<!-- <id>maven-snapshot</id> -->
<!-- <name>maven-snapshot</name> -->
<!-- <url>http://repo.typroject.org:8081/repository/maven-snapshots/</url> -->
<!-- </repository> -->
</repositories> </repositories>
<modules> <modules>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment