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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -42,7 +42,7 @@ public class RedisKey {
      * @return String
      */
     public static String buildReginKey(String userId, String token) {
-        return "region_" + userId + "_" + token;
+        return "biz_" + userId + "_" + token;
     }
     
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -532,6 +532,7 @@ public class CheckController extends AbstractBaseController {
         return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList());
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "/设备设施维保记录分页列表", notes = "外部接口装备和者水源使用")
     @GetMapping(value = "page/{originalId}/list")
     public ResponseModel getCheckListByOriginalId(

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -437,8 +437,8 @@ public class CheckServiceImpl implements ICheckService {
         List<DaoCriteria> criterias = new ArrayList<>();
         DaoCriteria daoCriteria = new DaoCriteria();
         daoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
-        daoCriteria.setPropertyName("originalId");
-        daoCriteria.setValue(originalId);
+        daoCriteria.setPropertyName("pointId");
+        daoCriteria.setValue(point.getId());
         criterias.add(daoCriteria);
         BaseQuerySpecification<Check> spec = new BaseQuerySpecification<>(criterias);
         Sort.Order idOrder = new Sort.Order(Sort.Direction.DESC, "id");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java

 package com.yeejoin.amos.patrol.business.controller;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.param.PlanInfoPageParam;
@@ -22,21 +9,32 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
 import com.yeejoin.amos.patrol.business.util.PlanPageParamUtil;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
-import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import com.yeejoin.amos.patrol.dao.entity.Plan;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.HashMap;
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/api/plan")
-@Api(tags="巡检计划api")
+@Api(tags = "巡检计划api")
 public class PlanController extends AbstractBaseController {
     private final Logger log = LoggerFactory.getLogger(PlanController.class);
     @Autowired
-	private IPlanService planService ;
+    private IPlanService planService;
+
     /**
      * 巡检计划查询
+     *
      * @param
      * @param param
      * @return
@@ -49,25 +47,27 @@ public class PlanController extends AbstractBaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
         String roleTypeName = getRoleTypeName(reginParams);
-		    String deptId="";
-		    String userId="";
+        String deptId = "";
+        String userId = "";
 
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
-		if(XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)){
-			deptId =getDepartmentId(reginParams);
-			if(deptId!=null&&!("").equals(deptId.trim()))
-				paramMap.put("departmentId",deptId);
-		 }else if(XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)){
-			userId=getUserId();
-			if(userId!=null&&!("").equals(userId.trim()))
-				paramMap.put("userId",userId);
+        if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName)) {
+            deptId = getDepartmentId(reginParams);
+            if (deptId != null && !("").equals(deptId.trim()))
+                paramMap.put("departmentId", deptId);
+        } else if (XJConstant.ROLE_NAME_PERSON.equals(roleTypeName)) {
+            userId = getUserId();
+            if (userId != null && !("").equals(userId.trim()))
+                paramMap.put("userId", userId);
         }
         PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, commonPageable, paramMap);
-		Page<HashMap<String,Object>> list= planService.getPlanInfo(param);
+        Page<HashMap<String, Object>> list = planService.getPlanInfo(param);
         return CommonResponseUtil.success(list);
     }
+
     /**
      * 巡检计划新增
+     *
      * @param param
      * @return
      */
@@ -79,20 +79,21 @@ public class PlanController extends AbstractBaseController {
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);
-			HashMap<String,Object> map = new HashMap<String,Object>();
+            HashMap<String, Object> map = new HashMap<String, Object>();
             map.put("org_code", loginOrgCode);
             map.put("user_id", userId);
             map.put("param", param);
             planService.addPlan(map);
             return CommonResponseUtil.success();
         } catch (Exception e) {
-			log.error(e.getMessage(),e);
+            log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("巡检计划新增失败");
         }
     }
 
     /**
      * 巡检计划删除（支持批量）
+     *
      * @param param
      * @return
      */
@@ -105,7 +106,7 @@ public class PlanController extends AbstractBaseController {
             planService.delPlanById(param);
             return CommonResponseUtil.success();
         } catch (Exception e) {
-			log.error(e.getMessage(),e);
+            log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("删除巡检计划失败");
         }
     }
@@ -113,18 +114,19 @@ public class PlanController extends AbstractBaseController {
 
     /**
      * 编辑巡检另存(支持批量)
+     *
      * @param param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "另存巡检计划", notes = "另存巡检计划")
     @RequestMapping(value = "/saveAs", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-	public CommonResponse planSaveAs( @ApiParam(value = "参数", required = true) @RequestBody String[] param) {
+    public CommonResponse planSaveAs(@ApiParam(value = "参数", required = true) @RequestBody String[] param) {
         try {
             planService.planSaveAs(param);
             return CommonResponseUtil.success();
         } catch (Exception e) {
-			log.error(e.getMessage(),e);
+            log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("另存巡检计划失败");
         }
     }
@@ -147,6 +149,7 @@ public class PlanController extends AbstractBaseController {
 
     /**
      * 巡检计划查询
+     *
      * @param
      * @param param
      * @return
@@ -160,7 +163,7 @@ public class PlanController extends AbstractBaseController {
         String loginOrgCode = getOrgCode(reginParams);
         HashMap<String, Object> paramMap = buildMybatisCriterias(loginOrgCode, roleTypeName);
         PlanInfoPageParam param = PlanPageParamUtil.fillPlanInfoParam(queryRequests, null, paramMap);
-		List<HashMap<String,Object>> list= planService.getPlanInfoNoPage(param);
+        List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
         return CommonResponseUtil.success(list);
     }
 
@@ -170,7 +173,7 @@ public class PlanController extends AbstractBaseController {
     public CommonResponse queryPlanList() {
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
-		List<HashMap<String,Object>> list= planService.queryPlanListByOrgCode(loginOrgCode);
+        List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode);
         return CommonResponseUtil.success(list);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -253,11 +253,12 @@ public class CheckServiceImpl implements ICheckService {
             check.setCheckTime(DateUtil.getLongDate(requestParam.getCheckTime()));
             check.setUploadTime(new Date());
             check.setOrgCode(requestParam.getOrgCode());
-            check.setUserId(user.getUserId().toString());
+            check.setUserId(user.getUserId());
             check.setUserName(user.getRealName());
-//            Department dep = user.getDepartment();
-            if (departmentModel != null) {
+            if (departmentModel != null && departmentModel.getSequenceNbr() != null) {
                 check.setDepId(departmentModel.getSequenceNbr().toString());
+            }
+            if (departmentModel != null) {
                 check.setDepName(departmentModel.getDepartmentName());
             }
             check.setCheckMode(requestParam.getCheckMode());

pom.xml

@@ -256,29 +256,15 @@
 	</dependencyManagement>
 	<repositories>
 		<repository>
-			<id>spring-snapshots</id>
-			<url>http://172.16.1.6:8081/nexus/content/repositories/spring.io/</url>
+			<id>Releases</id>
+			<name>Releases</name>
+			<url>http://172.16.1.6:8081/nexus/content/repositories/releases/</url>
 		</repository>
 		<repository>
-			<id>nexus</id>
-			<name>Team Nexus Repository</name>
-			<url>http://172.16.1.6:8081/nexus/content/groups/public</url>
+			<id>Snapshots</id>
+			<name>Snapshots</name>
+			<url>http://172.16.1.6:8081/nexus/content/repositories/snapshots/</url>
 		</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>
 
 	<modules>