1.维保记录增加冗余字段，维保任务增加冗余字段，及公司id、name字段

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

 package com.yeejoin.amos.boot.biz.common.bo;
 
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import lombok.Builder;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -16,52 +18,14 @@ public class ReginParams implements Serializable {
     private DepartmentBo department;
     private AgencyUserModel userModel;
     private PersonIdentity personIdentity;
-
+    
+    @Data
     public static class PersonIdentity implements Serializable {
-
         private String identityType;
         private String personSeq;
         private String personName;
         private String companyId;
-
-        public PersonIdentity(String identityType, String personSeq, String personName,String companyId){
-            this.identityType = identityType;
-            this.personSeq = personSeq;
-            this.personName = personName;
-            this.companyId = companyId;
-        }
-
-        public String getPersonSeq() {
-            return personSeq;
-        }
-
-        public void setPersonSeq(String personSeq) {
-            this.personSeq = personSeq;
-        }
-
-        public String getIdentityType() {
-            return identityType;
-        }
-
-        public void setIdentityType(String identityType) {
-            this.identityType = identityType;
-        }
-
-        public String getPersonName() {
-            return personName;
-        }
-
-        public void setPersonName(String personName) {
-            this.personName = personName;
-        }
-
-        public String getCompanyId() {
-            return companyId;
-        }
-
-        public void setCompanyId(String companyId) {
-            this.companyId = companyId;
-        }
+        private String companyName;
     }
 
     public PersonIdentity getPersonIdentity() {

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Check.java

@@ -25,9 +25,6 @@ public class Check extends BasicEntity {
 
 	private static final long serialVersionUID = 1L;
 
-
-	
-
 	/**
 	 * 参考地址
 	 */
@@ -119,6 +116,19 @@ public class Check extends BasicEntity {
 	private String pointName;
 
 	/**
+	 * 设备编号
+	 */
+	private String pointNo;
+
+	public String getPointNo() {
+		return pointNo;
+	}
+
+	public void setPointNo(String pointNo) {
+		this.pointNo = pointNo;
+	}
+
+	/**
 	 * 巡检备注说明
 	 */
 	private String remark;
@@ -179,6 +189,86 @@ public class Check extends BasicEntity {
 	@Column(name="error_classify")
 	private String errorClassify;
 
+	/**
+	 * 业主单位id
+	 */
+	private String ownerId;
+
+	/**
+	 * 维保公司id
+	 */
+	private String companyId;
+
+	/**
+	 * 维保公司名称
+	 */
+	private String companyName;
+
+	/**
+	 * 安装位置：buildingName
+	 */
+	private String buildingName;
+
+	/**
+	 * 设备分类
+	 */
+	private String equipmentName;
+
+	/**
+	 * 计划类型
+	 */
+	private String planType;
+
+	public String getBuildingName() {
+		return buildingName;
+	}
+
+	public void setBuildingName(String buildingName) {
+		this.buildingName = buildingName;
+	}
+
+	public String getEquipmentName() {
+		return equipmentName;
+	}
+
+	public void setEquipmentName(String equipmentName) {
+		this.equipmentName = equipmentName;
+	}
+
+	public String getPlanType() {
+		return planType;
+	}
+
+	public void setPlanType(String planType) {
+		this.planType = planType;
+	}
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+
+
+	public String getOwnerId() {
+		return ownerId;
+	}
+
+	public void setOwnerId(String ownerId) {
+		this.ownerId = ownerId;
+	}
+
 	private List<CheckShot> checkShot;
 
 	public Check() {

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

@@ -19,6 +19,7 @@ import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.maintenance.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import com.yeejoin.amos.maintenance.core.util.StringUtil;
+import com.yeejoin.amos.maintenance.dao.entity.Check;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -305,7 +306,7 @@ public class CheckController extends AbstractBaseController {
     @GetMapping(value = "/{date}/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
             @ApiParam(value = "date,格式YYYY-MM-DD",required = true)@PathVariable String date) {
-        HashMap<String, Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
         Map<String, Object> authMap = Bean.BeantoMap(reginParams.getPersonIdentity());
@@ -529,4 +530,14 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(CheckRecordOrderByEnum.getEnumList());
     }
 
+    @ApiOperation(value = "/设备设施维保记录分页列表",notes = "外部接口装备和者水源使用")
+    @GetMapping(value = "page/{originalId}/list")
+    public CommonResponse getCheckListByOriginalId(
+            @PathVariable String originalId,
+            @RequestParam(value = "current") int pageNum,
+            @RequestParam(value = "size") int pageSize
+            ){
+        CommonPageable pageable = new CommonPageable(pageNum,pageSize);
+        return CommonResponseUtil.success(checkService.getCheckListByOriginalId(originalId,pageable));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/entity/mybatis/PlanTaskPointInputItemBo.java

@@ -30,11 +30,46 @@ public class PlanTaskPointInputItemBo {
 	 * 巡检点id
 	 */
 	private long pointId;
+
+	/**
+	 * 编号
+	 */
+	private String pointNo;
 	
 	/**
 	 * 巡检任务id
 	 */
 	private long planTaskId;
+
+	/**
+	 * 业主单位id
+	 */
+	private String ownerId;
+
+	/**
+	 * 单位id
+	 */
+	private String companyId;
+
+	/**
+	 * 安装位置：buildingName
+	 */
+	private String buildingName;
+
+	/**
+	 * 设备分类
+	 */
+	private String equipmentName;
+
+	/**
+	 * 计划类型
+	 */
+	private String planType;
+
+	/**
+	 * 单位名称
+	 */
+	private String companyName;
 	
 	/**
 	 * 巡检任务详情id

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

@@ -28,6 +28,7 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IEquipmentHandlerServ
 import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPointService;
 import com.yeejoin.amos.maintenance.business.util.CheckDetailInputPageParam;
+import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
 import com.yeejoin.amos.maintenance.business.util.ToolUtils;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
@@ -37,8 +38,10 @@ import com.yeejoin.amos.maintenance.common.enums.PointLevelEnum;
 import com.yeejoin.amos.maintenance.common.enums.PointStatusEnum;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.response.*;
+import com.yeejoin.amos.maintenance.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.maintenance.core.util.DateUtil;
 import com.yeejoin.amos.maintenance.core.util.StringUtil;
+import com.yeejoin.amos.maintenance.core.util.query.BaseQuerySpecification;
 import com.yeejoin.amos.maintenance.dao.entity.*;
 import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
 import com.yeejoin.amos.maintenance.mqtt.MqttGateway;
@@ -50,6 +53,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -148,12 +152,19 @@ public class CheckServiceImpl implements ICheckService {
             check.setPlanName(detail.get("planName").toString());
             check.setPointName(point.getName());
             check.setPointId(point.getId());
+            check.setPointNo(point.getPointNo());
             check.setRemark(recordParam.getRemark());
             check.setCheckTime(new Date());
             check.setUploadTime(new Date());
             check.setOrgCode(recordParam.getOrgCode());
             check.setUserId(mtUserSeq);
+            check.setOwnerId(point.getOwnerId());
+            check.setBuildingName(point.getBuildingName());
+            check.setEquipmentName(point.getEquipmentName());
+            check.setPlanType(detail.get("planType").toString());
             check.setUserName(personIdentity.getPersonName());
+            check.setCompanyId(personIdentity.getCompanyId());
+            check.setCompanyName(personIdentity.getCompanyName());
             List<CheckInputParam> list = recordParam.getCheckItems();
             List<CheckInput> checkItemList = new ArrayList<>();
             List<Map<String, Object>> unqualifiedCheckItemList = Lists.newArrayList();
@@ -401,6 +412,27 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
+    public Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable) {
+        Point point = iPointDao.findByOriginalId(originalId);
+        if(point == null){
+            throw new RuntimeException("不存在该设备设施");
+        }
+        List<DaoCriteria> criterias = new ArrayList<>();
+        DaoCriteria daoCriteria = new DaoCriteria();
+        daoCriteria.setOperator(QueryOperatorEnum.EQUAL.getName());
+        daoCriteria.setPropertyName("originalId");
+        daoCriteria.setValue(originalId);
+        criterias.add(daoCriteria);
+        BaseQuerySpecification<Check> spec = new BaseQuerySpecification<>(criterias);
+        Sort.Order idOrder = new Sort.Order(Sort.Direction.DESC, "id");
+        List<Sort.Order> orders = new ArrayList<Sort.Order>();
+        orders.add(idOrder);
+        Sort sort = Sort.by(orders);
+        pageable.setSort(sort);
+        return checkDao.findAll(spec,pageable);
+    }
+
+    @Override
     public AppPointCheckRespone queryCheckPointDetail(String toke, String product, String appKey, long checkId) {
 //		List list = checkMapper.queryCheckPointInputItem(planTaskId, pointId);
         List<PointCheckDetailBo> list = checkMapper.findCheckPointInputItem(checkId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.maintenance.core.common.response.CommonPage;
 import com.yeejoin.amos.maintenance.core.common.response.GraphInitDataResponse;
 import com.yeejoin.amos.maintenance.core.common.response.QueryCriteriaRespone;
+import com.yeejoin.amos.maintenance.dao.entity.Check;
 import com.yeejoin.amos.maintenance.exception.YeeException;
 import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
@@ -266,4 +267,6 @@ public interface ICheckService {
      * @return
      */
     int checkHasRecord(Long planTaskId, Long pointId);
+
+    Page<Check> getCheckListByOriginalId(String originalId, CommonPageable pageable);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentifyAspect.java

@@ -37,11 +37,19 @@ public class PersonIdentifyAspect {
 //            String personSeq = result.get("personSeq").toString();
 //            String personName = result.get("personName").toString();
 //            String companyId = result.get("companyId").toString();
+//            String companyName = result.get("companyName").toString();
             String identityType = "1";
             String personSeq = "1421016571081420802";
             String personName = "SHG";
             String companyId = "1420727427956502529";
-            reginParam.setPersonIdentity(new ReginParams.PersonIdentity(identityType, personSeq, personName, companyId));
+            String companyName ="机电公司";
+            ReginParams.PersonIdentity personIdentity  = new ReginParams.PersonIdentity();
+            personIdentity.setIdentityType(identityType);
+            personIdentity.setPersonSeq(personSeq);
+            personIdentity.setPersonName(personName);
+            personIdentity.setCompanyId(companyId);
+            personIdentity.setCompanyName(companyName);
+            reginParam.setPersonIdentity(new ReginParams.PersonIdentity());
             redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java

@@ -197,14 +197,21 @@ public class JobService implements IJobService {
                 check.setDepName("");
                 check.setPointName(arg.getPointName());
                 check.setPointId(arg.getPointId());
+                check.setPointNo(arg.getPointNo());
+                check.setBuildingName(arg.getBuildingName());
                 check.setUploadTime(new Date());
                 check.setPlanId(arg.getPlanId());
                 check.setPlanName(arg.getPlanName());
+                check.setPlanType(arg.getPlanType());
                 check.setPlanTaskId(arg.getPlanTaskId());
                 check.setPlanTaskDetailId(arg.getPlanTaskDetailId());
                 check.setRouteId(arg.getRouteId());
                 check.setRouteName(arg.getRouteName());
                 check.setCheckTime(arg.getEndTime());
+                check.setOwnerId(arg.getOwnerId());
+                check.setCompanyId(arg.getCompanyId());
+                check.setCompanyName(arg.getCompanyName());
+                check.setEquipmentName(arg.getEquipmentName());
                 check.setIsOk(CheckStatusEnum.OMISSION.getCode());
                 check = iCheckDao.saveAndFlush(check);
                 checkMap.put(arg.getPointId(), check);

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2037,7 +2037,7 @@
             pp.equipment_name equipmentName,
             pp.belong_system_id systemId,
             pp.belong_system_name systemName,
-            CONCAT(pp.address, pp.building_name) address,
+            CONCAT_WS(',',pp.building_name,pp.address) address,
             CONCAT(date_format(
                 ppl.plan_begin,
                 '%Y-%m-%d %H:%i:%s'

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -388,6 +388,10 @@
 			temp1.classifyName,
 			temp1.routeName,
 			temp1.pointName,
+			temp1.ownerId,
+			temp1.pointNo,
+			temp1.buildingName,
+			temp1.equipmentName,
 			pii.`name` inputName,
 			temp2.*
 		FROM
@@ -404,7 +408,11 @@
 					ppc.id classifyId,
 					ppc.`name` classifyName,
 				    r.name as routeName,
-					p.name as pointName
+					p.name as pointName,
+				    p.owner_id as ownerId,
+				    p.point_no as pointNo,
+				    p.building_name as buildingName,
+					p.equipment_name as equipmentName
 				FROM
 					p_route_point_item prpi
 					LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
@@ -423,9 +431,13 @@
 					ptd.user_id AS userId,
 					ptd.org_code AS orgCode,
 					ptd.end_time AS endTime,
+					ptd.end_time AS endTime,
+					ptd.company_id as companyId,
+					ptd.company_name as companyName,
 					pptd.id as planTaskDetailId,
 					(select p_plan.dept_id from  p_plan where p_plan.id=ptd.plan_id) depId,
-					(select p_plan.name from  p_plan where p_plan.id=ptd.plan_id) planName
+					(select p_plan.name from  p_plan where p_plan.id=ptd.plan_id) planName,
+					(select p_plan.plan_type from  p_plan where p_plan.id=ptd.plan_id) planType
 				FROM
 					p_plan_task_detail pptd,
 					p_plan_task ptd

amos-boot-system-maintenance/src/main/resources/db/mapper/plan_task_detail.xml

@@ -13,7 +13,15 @@
 	</delete>
     <select id="findPlanTaskByTaskIdAndPointId" resultType="Map">
 		SELECT
-			p.name planName, pt.begin_time beginTime, pt.end_time endTime, pp.name pointName, pp.point_no pointNo, ptd.id planTaskDetailId, pt.route_id routeId, pr.name routeName
+			p.name planName,
+		    pt.begin_time beginTime,
+		    pt.end_time endTime,
+		    pp.name pointName,
+		    pp.point_no pointNo,
+		    ptd.id planTaskDetailId,
+		    pt.route_id routeId,
+		    pr.name routeName,
+		    p.plan_type as planType
 		FROM
 			p_plan_task pt
 		LEFT JOIN p_plan p ON pt.plan_id = p.id