tzs 电梯信息优化项

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java

@@ -220,4 +220,7 @@ public class ElevatorDto extends BaseDto {
 
     @ApiModelProperty(value = "纬度")
     private String latitude;
+
+    @ApiModelProperty(value = "保险信息")
+    private ElevatorInsureDto elevatorInsureDto;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorInsureDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 保险信息
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ElevatorInsureDto", description="保险信息")
+public class ElevatorInsureDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "承保单位")
+    private String contractingUnit;
+
+    @ApiModelProperty(value = "承保单位id")
+    private Long contractingUnitId;
+
+    @ApiModelProperty(value = "服务单位")
+    private String serviceUnit;
+
+    @ApiModelProperty(value = "服务单位id")
+    private Long serviceUnitId;
+
+    @ApiModelProperty(value = "理赔电话")
+    private String claimPhone;
+
+    @ApiModelProperty(value = "保险截止日期")
+    private Date insureEndDate;
+
+    @ApiModelProperty(value = "保单号")
+    private String insureNum;
+
+    @ApiModelProperty(value = "理赔主体")
+    private String claimBody;
+
+    @ApiModelProperty(value = "保险附件")
+    private List<AttachmentDto> insureAttach;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorInsureRelationDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 电梯与保险关联表
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@Data
+@EqualsAndHashCode
+@ApiModel(value="ElevatorInsureRelationDto", description="电梯与保险关联表")
+public class ElevatorInsureRelationDto  implements Serializable {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "电梯注册编码")
+    private String elevatorCode;
+
+    @ApiModelProperty(value = "保险订单号")
+    private String insureCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/ElevatorInsure.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 保险信息
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_elevator_insure")
+public class ElevatorInsure extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 承保单位
+     */
+	@TableField("contracting_unit")
+    private String contractingUnit;
+
+    /**
+     * 承保单位id
+     */
+	@TableField("contracting_unit_id")
+    private Long contractingUnitId;
+
+    /**
+     * 服务单位
+     */
+	@TableField("service_unit")
+    private String serviceUnit;
+
+    /**
+     * 服务单位id
+     */
+	@TableField("service_unit_id")
+    private Long serviceUnitId;
+
+    /**
+     * 理赔电话
+     */
+	@TableField("claim_phone")
+    private String claimPhone;
+
+    /**
+     * 保险截止日期
+     */
+	@TableField("insure_end_date")
+    private Date insureEndDate;
+
+    /**
+     * 保单号
+     */
+	@TableField("insure_num")
+    private String insureNum;
+
+    /**
+     * 理赔主体
+     */
+	@TableField("claim_body")
+    private String claimBody;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/ElevatorInsureRelation.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 电梯与保险关联表
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@Data
+@EqualsAndHashCode
+@Accessors(chain = true)
+@TableName("tz_elevator_insure_relation")
+public class ElevatorInsureRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电梯注册编码
+     */
+	@TableField("elevator_code")
+    private String elevatorCode;
+
+    /**
+     * 保险订单号
+     */
+	@TableField("insure_code")
+    private String insureCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorInsureMapper.java

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorInsure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 保险信息 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+public interface ElevatorInsureMapper extends BaseMapper<ElevatorInsure> {
+
+    ElevatorInsureDto getInsureInfoByElevatorCode(@Param("elevatorCode") String elevatorCode);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorInsureRelationMapper.java

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorInsureRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 电梯与保险关联表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+public interface ElevatorInsureRelationMapper extends BaseMapper<ElevatorInsureRelation> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IElevatorInsureRelationService.java

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+/**
+ * 电梯与保险关联表接口类
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+public interface IElevatorInsureRelationService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IElevatorInsureService.java

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureDto;
+
+/**
+ * 保险信息接口类
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+public interface IElevatorInsureService {
+
+    ElevatorInsureDto getInsureInfoByElevatorCode(String elevatorCode);
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/ElevatorInsureMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorInsureMapper">
+
+
+    <select id="getInsureInfoByElevatorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureDto">
+       SELECT
+            t.*
+        FROM
+            tz_elevator_insure t
+        LEFT JOIN tz_elevator_insure_relation r ON r.insure_code = t.insure_num
+        WHERE
+            r.elevator_code =#{elevatorCode} and t.is_delete = 0
+    </select>
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/ElevatorInsureRelationMapper.xml

+<?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.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorInsureRelationMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorInsureController.java

+package com.yeejoin.amos.boot.module.tzs.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorInsureServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 保险信息
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@RestController
+@Api(tags = "保险信息Api")
+@RequestMapping(value = "/elevator-insure")
+public class ElevatorInsureController extends BaseController {
+
+    @Autowired
+    ElevatorInsureServiceImpl elevatorInsureServiceImpl;
+
+    /**
+     * 新增保险信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增保险信息", notes = "新增保险信息")
+	public ResponseModel<ElevatorInsureDto> save(@RequestBody ElevatorInsureDto model) {
+	    model = elevatorInsureServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新保险信息", notes = "根据sequenceNbr更新保险信息")
+	public ResponseModel<ElevatorInsureDto> updateBySequenceNbrElevatorInsure(@RequestBody ElevatorInsureDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(elevatorInsureServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除保险信息", notes = "根据sequenceNbr删除保险信息")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(elevatorInsureServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个保险信息",  notes = "根据sequenceNbr查询单个保险信息")
+	public ResponseModel<ElevatorInsureDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(elevatorInsureServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "保险信息分页查询",  notes = "保险信息分页查询")
+	public ResponseModel<Page<ElevatorInsureDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<ElevatorInsureDto> page = new Page<ElevatorInsureDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(elevatorInsureServiceImpl.queryForElevatorInsurePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "保险信息列表全部数据查询",   notes = "保险信息列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<ElevatorInsureDto>> selectForList() {
+	    return ResponseHelper.buildResponse(elevatorInsureServiceImpl.queryForElevatorInsureList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorInsureRelationServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorInsureRelation;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorInsureRelationMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorInsureRelationService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureRelationDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 电梯与保险关联表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@Service
+public class ElevatorInsureRelationServiceImpl extends BaseService<ElevatorInsureRelationDto,ElevatorInsureRelation,ElevatorInsureRelationMapper> implements IElevatorInsureRelationService {
+    /**
+     * 分页查询
+     */
+    public Page<ElevatorInsureRelationDto> queryForElevatorInsureRelationPage(Page<ElevatorInsureRelationDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<ElevatorInsureRelationDto> queryForElevatorInsureRelationList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorInsureServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorInsure;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorInsureMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorInsureService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 保险信息服务实现类
+ *
+ * @author system_generator
+ * @date 2021-10-29
+ */
+@Service
+public class ElevatorInsureServiceImpl extends BaseService<ElevatorInsureDto,ElevatorInsure,ElevatorInsureMapper> implements IElevatorInsureService {
+
+
+    @Autowired
+    ISourceFileService sourceFileService;
+
+    /**
+     * 分页查询
+     */
+    public Page<ElevatorInsureDto> queryForElevatorInsurePage(Page<ElevatorInsureDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<ElevatorInsureDto> queryForElevatorInsureList()   {
+        return this.queryForList("" , false);
+    }
+
+    @Override
+    public ElevatorInsureDto getInsureInfoByElevatorCode(String elevatorCode) {
+        ElevatorInsureDto tempDto = baseMapper.getInsureInfoByElevatorCode(elevatorCode);
+        // 获取保险单附件信息
+        if(tempDto != null) {
+            Map<String, List<AttachmentDto>> attachMap = sourceFileService.getAttachments(tempDto.getSequenceNbr());
+            List<AttachmentDto> attachment = attachMap.get("insure");
+            tempDto.setInsureAttach(attachment);
+        }
+        return tempDto;
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java

@@ -12,10 +12,14 @@ import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInsureDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorWlInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorInsure;
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorInsureRelation;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorInsureRelationService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -63,6 +67,11 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     @Autowired
     DataDictionaryServiceImpl iDataDictionaryService;
 
+    @Autowired
+    ElevatorInsureRelationServiceImpl iElevatorInsureRelationServiceImpl;
+
+    @Autowired
+    ElevatorInsureServiceImpl iElevatorInsureServiceImpl;
 
     /**
      * 保存电梯信息
@@ -141,6 +150,12 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         } else {
             elevatorDto.setUseStatusStr("停用");
         }
+        // 获取保险信息
+        ElevatorInsureDto elevatorInsureDto = iElevatorInsureServiceImpl.getInsureInfoByElevatorCode(elevatorDto.getRegisterCode());
+        if(elevatorInsureDto == null ) {
+            elevatorInsureDto = new ElevatorInsureDto();
+        }
+        elevatorDto.setElevatorInsureDto(elevatorInsureDto);
         return elevatorDto;
     }