维保/急修评价

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/controller/EvaluationController.java

@@ -0,0 +1,39 @@
+package cn.com.ty.lift.business.evaluation.controller;
+
+
+import cn.com.ty.lift.business.evaluation.dao.entity.model.EvaluationRequest;
+import cn.com.ty.lift.business.evaluation.service.EvaluationService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 保养单用户评价 前端控制器
+ * </p>
+ *
+ * @author huangyuan
+ * @since 2019-12-31
+ */
+@RestController
+@RequestMapping("/evaluation")
+public class EvaluationController {
+
+    @Autowired
+    private EvaluationService evaluationService;
+
+    /**
+     * @param
+     * @return
+     * @description 保存评价信息
+     * @date 2019-12-31 15:46
+     */
+    @PostMapping("/save")
+    public RestResponse save(EvaluationRequest evaluationRequest) {
+        return evaluationService.saveEvaluation(evaluationRequest);
+    }
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/dao/entity/Evaluation.java

@@ -0,0 +1,106 @@
+package cn.com.ty.lift.business.evaluation.dao.entity;
+
+import cn.com.ty.lift.business.evaluation.dao.entity.model.EvaluationRequest;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 保养单用户评价
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Evaluation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 电梯ID
+     */
+    @TableField("lift_id")
+    private Long liftId;
+
+    /**
+     * 维修/保养记录ID
+     */
+    @TableField("record_id")
+    private Long recordId;
+
+    /**
+     * 来源（1 维保；2 急修）
+     */
+    @TableField("source")
+    private Integer source;
+
+    /**
+     * 类型（1 物业评价；2 手写评价；3 自动评价）
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 用户建议
+     */
+    @TableField("advice")
+    private String advice;
+
+    /**
+     * 服务态度
+     */
+    @TableField("service_level")
+    private Integer serviceLevel;
+
+    /**
+     * 保养满意度
+     */
+    @TableField("star_level")
+    private Integer starLevel;
+
+    /**
+     * 手写签名图片
+     */
+    @TableField("img_url")
+    private String imgUrl;
+
+    /**
+     * 评价时间
+     */
+    @TableField("post_date")
+    private LocalDateTime postDate;
+
+    /**
+     * 评价人ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    public Evaluation() {
+    }
+
+    public Evaluation(EvaluationRequest evaluationRequest) {
+        this.id = evaluationRequest.getId();
+        this.liftId = evaluationRequest.getLiftId();
+        this.recordId = evaluationRequest.getRecordId();
+        this.source = evaluationRequest.getSource();
+        this.type = evaluationRequest.getType();
+        this.advice = evaluationRequest.getAdvice();
+        this.serviceLevel = evaluationRequest.getServiceLevel();
+        this.starLevel = evaluationRequest.getStarLevel();
+        this.imgUrl = evaluationRequest.getImgUrl();
+        this.userId = evaluationRequest.getUserId();
+    }
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/dao/entity/model/EvaluationRequest.java

@@ -0,0 +1,67 @@
+package cn.com.ty.lift.business.evaluation.dao.entity.model;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-31
+ * @description
+ */
+@Data
+public class EvaluationRequest {
+
+    private Long id;
+
+    /**
+     * 电梯ID
+     */
+    private Long liftId;
+
+    /**
+     * 维修/保养记录ID
+     */
+    private Long recordId;
+
+    /**
+     * 来源（1 维保；2 急修）
+     */
+    private Integer source;
+
+    /**
+     * 类型（1 物业评价；2 手写评价；3 自动评价）
+     */
+    private Integer type;
+
+    /**
+     * 用户建议
+     */
+    private String advice;
+
+    /**
+     * 服务态度
+     */
+    private Integer serviceLevel;
+
+    /**
+     * 保养满意度
+     */
+    private Integer starLevel;
+
+    /**
+     * 手写签名图片
+     */
+    private String imgUrl;
+
+    /**
+     * 评价时间
+     */
+    private LocalDateTime postDate;
+
+    /**
+     * 评价人ID
+     */
+    private Long userId;
+    
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/dao/mapper/EvaluationMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.business.evaluation.dao.mapper;
+
+import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 保养单用户评价 Mapper 接口
+ * </p>
+ *
+ * @author huangyuan
+ * @since 2019-12-31
+ */
+public interface EvaluationMapper extends BaseMapper<Evaluation> {
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/service/EvaluationService.java

@@ -0,0 +1,25 @@
+package cn.com.ty.lift.business.evaluation.service;
+
+import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
+import cn.com.ty.lift.business.evaluation.dao.entity.model.EvaluationRequest;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 保养单用户评价 服务类
+ * </p>
+ *
+ * @author huangyuan
+ * @since 2019-12-31
+ */
+public interface EvaluationService extends IService<Evaluation> {
+
+    /**
+     * @description 保存电梯评价信息
+     * @date 2019-12-31 15:19
+     * @param
+     * @return
+     */
+    RestResponse saveEvaluation(EvaluationRequest evaluationRequest);
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/service/impl/EvaluationServiceImpl.java

@@ -0,0 +1,32 @@
+package cn.com.ty.lift.business.evaluation.service.impl;
+
+import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
+import cn.com.ty.lift.business.evaluation.dao.entity.model.EvaluationRequest;
+import cn.com.ty.lift.business.evaluation.dao.mapper.EvaluationMapper;
+import cn.com.ty.lift.business.evaluation.service.EvaluationService;
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 保养单用户评价 服务实现类
+ * </p>
+ *
+ * @author huangyuan
+ * @since 2019-12-31
+ */
+@Service
+public class EvaluationServiceImpl extends ServiceImpl<EvaluationMapper, Evaluation> implements EvaluationService {
+
+    @Override
+    public RestResponse saveEvaluation(EvaluationRequest evaluationRequest) {
+        Evaluation evaluation = new Evaluation(evaluationRequest);
+        evaluation.setPostDate(LocalDateTime.now());
+        this.save(evaluation);
+        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "评价成功");
+    }
+}

lift-common/src/main/java/cn.com.ty.lift.common/aliservice/constants/AliConstants.java

@@ -34,12 +34,12 @@ public class AliConstants {
         /**
          * 接口域名
          */
-        String DOMAIN = "dysmsapi.aliyuncs.com";//域名
+        String DOMAIN = "dysmsapi.aliyuncs.com";
 
         /**
          * 接口版本
          */
-        String VERSION = "2017-05-25";//版本
+        String VERSION = "2017-05-25";
 
         /**
          * 接口名称-发送发送短信

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -74,7 +74,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
             PojoUtils.pojoCopy(mtCompanyAttestationInfo, mtCompanyAttestation);
             mtCompanyAttestation = mtCompanyAttestationInfo;
         } else {
-            if(userInfo != null){
+            if (userInfo != null) {
                 //如果是新建,设置创建者名称
                 mtCompanyAttestation.setCreateUser(userInfo.getName());
             }
@@ -98,7 +98,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         Long companyId = mtCompanyAttestation.getMtCompanyId();
 
         //认证处理
-        MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest, ApiConstants.CompanyConstants.MAINTENANCE_PASS);
+        MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest,
+                ApiConstants.CompanyConstants.MAINTENANCE_PASS);
         //1.将认证通过的信息赋值到本来公司信息中
         maintenanceCompany.copyAttestation(mtCompanyAttestation);
         //2.设置企业电梯台量
@@ -121,7 +122,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     public RestResponse auditFail(CompanyAttestationRequest companyAttestationRequest) {
         MtCompanyAttestation mtCompanyAttestation = this.getById(companyAttestationRequest.getId());
         //认证处理
-        MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest, ApiConstants.CompanyConstants.MAINTENANCE_PASS);
+        MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest,
+                ApiConstants.CompanyConstants.MAINTENANCE_PASS);
         this.updateById(mtCompanyAttestation);
         maintenanceCompanyService.updateById(maintenanceCompany);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "操作成功");
@@ -157,15 +159,15 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         );
         List<CompanyAttestationResponse> companyAttestationResponseList = new ArrayList<>();
         List<MtCompanyAttestation> mtCompanyAttestationList = mtCompanyAttestationPage.getRecords();
-        if(mtCompanyAttestationList != null && mtCompanyAttestationList.size() > 0){
+        if (mtCompanyAttestationList != null && mtCompanyAttestationList.size() > 0) {
             List<Long> customerManagerIdList = ProjectUtils.getAttrList(mtCompanyAttestationList, "customerManagerId", null);
             List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(customerManagerIdList);
             Map<Long, UserInfo> customerManagerIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
-            for(MtCompanyAttestation mtCompanyAttestation : mtCompanyAttestationList){
+            for (MtCompanyAttestation mtCompanyAttestation : mtCompanyAttestationList) {
                 CompanyAttestationResponse companyAttestationResponse = new CompanyAttestationResponse(mtCompanyAttestation);
                 //设置客户经理名称
                 UserInfo userInfo = customerManagerIdToUserInfo.get(mtCompanyAttestation.getCustomerManagerId());
-                if(userInfo != null){
+                if (userInfo != null) {
                     companyAttestationResponse.setCustomerManagerName(userInfo.getName());
                 }
                 companyAttestationResponseList.add(companyAttestationResponse);
@@ -183,7 +185,8 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
      * @param auditResult 审核结果
      * @return
      */
-    private MaintenanceCompany auditHandle(MtCompanyAttestation mtCompanyAttestation, CompanyAttestationRequest companyAttestationRequest, int auditResult) {
+    private MaintenanceCompany auditHandle(MtCompanyAttestation mtCompanyAttestation,
+                                           CompanyAttestationRequest companyAttestationRequest, int auditResult) {
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyAttestation.getMtCompanyId());
         //设置认证时间
         mtCompanyAttestation.setDealTime(LocalDateTime.now());

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/LoginController.java

@@ -80,8 +80,8 @@ public class LoginController {
     /**
      * @param request     请求对象
      * @param userRequest 用户参数对象
-     * @return
-     * @description
+     * @return RestResponse
+     * @description 登录
      * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/login")