fix(jg):超设计使用年限功能开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgOverDesignServiceLifeDto.java

@@ -48,8 +48,8 @@ public class JgOverDesignServiceLifeDto  extends BaseDto {
     @ApiModelProperty(value = "使用登记编号")
     private String useRegistrationCode;
 
-    @ApiModelProperty(value = "原使用登记证")
-    private String originalUseRegistrationCertificate;
+    @ApiModelProperty(value = "其他附件")
+    private String otherAccessories;
 
     @ApiModelProperty(value = "状态")
     private String status;
@@ -110,4 +110,7 @@ public class JgOverDesignServiceLifeDto  extends BaseDto {
 
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
+
+    @ApiModelProperty(value = "延期使用年限")
+    private Date delayServiceLife;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgOverDesignServiceLife.java

@@ -41,46 +41,10 @@ public class JgOverDesignServiceLife extends BaseEntity {
     private String useUnitCreditCode;
 
     /**
-     * 安全评估机构名称
+     * 其他附件
      */
-	@TableField("safety_assessment_name")
-    private String safetyAssessmentName;
-
-    /**
-     * 安全评估机构统一信用代码
-     */
-	@TableField("safety_assessment_credit_code")
-    private String safetyAssessmentCreditCode;
-
-    /**
-     * 安全评估报告
-     */
-	@TableField("safety_assessment_report")
-    private String safetyAssessmentReport;
-
-    /**
-     * 安全评估结果
-     */
-	@TableField("safety_assessment_result")
-    private String safetyAssessmentResult;
-
-    /**
-     * 安全评估日期
-     */
-	@TableField("safety_assessment_date")
-    private Date safetyAssessmentDate;
-
-    /**
-     * 使用登记编号
-     */
-	@TableField("use_registration_code")
-    private String useRegistrationCode;
-
-    /**
-     * 原使用登记证
-     */
-	@TableField("original_use_registration_certificate")
-    private String originalUseRegistrationCertificate;
+    @TableField("other_accessories")
+    private String otherAccessories;
 
     /**
      * 状态

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgOverDesignServiceLifeEq.java

@@ -52,4 +52,51 @@ public class JgOverDesignServiceLifeEq extends BaseEntity {
 	@TableField("create_user_name")
     private String createUserName;
 
+    /**
+     * 设备信息json
+     */
+    @TableField("device_info")
+    private String deviceInfo;
+
+    /**
+     * 使用登记证
+     */
+    @TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
+     * 安全评估机构名称
+     */
+    @TableField("safety_assessment_name")
+    private String safetyAssessmentName;
+
+    /**
+     * 安全评估机构统一信用代码
+     */
+    @TableField("safety_assessment_credit_code")
+    private String safetyAssessmentCreditCode;
+
+    /**
+     * 安全评估报告
+     */
+    @TableField("safety_assessment_report")
+    private String safetyAssessmentReport;
+
+    /**
+     * 安全评估结果
+     */
+    @TableField("safety_assessment_result")
+    private String safetyAssessmentResult;
+
+    /**
+     * 安全评估日期
+     */
+    @TableField("safety_assessment_date")
+    private Date safetyAssessmentDate;
+
+    /**
+     * 延期使用年限
+     */
+    @TableField("delay_service_life")
+    private String delayServiceLife;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/RegistrationTypeEnum.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum RegistrationTypeEnum {
     新设备首次启用("新设备首次启用","DJ_SY"),
+    达到设计使用年限继续使用("达到设计使用年限继续使用","DJ_CSJ"),
     历史无证设备登记("历史无证设备登记","SP_TT");
 
     private String name;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -806,9 +806,8 @@ public class CommonController extends BaseController {
     public ResponseModel<Map<String,Object>> getRegistrationChangeCertificateUrl(@RequestBody JSONObject map) {
         JSONObject formData = JSONObject.parseObject(JSONObject.toJSONString(map.get("formData")));
         ReginParams selectedOrgInfo = getSelectedOrgInfo();
-        String manageType = String.valueOf(map.get("manageType"));
         formData.put("userName",selectedOrgInfo.getUserModel().getRealName());
-        return ResponseHelper.buildResponse(commonService.getRegistrationChangeCertificateUrl(manageType, formData));
+        return ResponseHelper.buildResponse(commonService.getRegistrationChangeCertificateUrl(formData));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgOverDesignServiceLifeController.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -9,15 +12,14 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgOverDesignServiceLifeServiceImpl;
 import org.typroject.tyboot.component.event.RestEventTrigger;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 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.yeejoin.amos.boot.module.jg.api.entity.JgOverDesignServiceLife;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -32,19 +34,21 @@ import java.util.List;
 public class JgOverDesignServiceLifeController extends BaseController {
 
     @Autowired
-    JgOverDesignServiceLifeServiceImpl jgOverDesignServiceLifeServiceImpl;
+	private JgOverDesignServiceLifeServiceImpl jgOverDesignServiceLifeServiceImpl;
+	@Autowired
+	private RedisUtils redisUtils;
 
-    /**
-     * 新增
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	/**
+	 * 新增
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JgOverDesignServiceLife> save(@RequestBody JgOverDesignServiceLife entity) {
-	    entity = jgOverDesignServiceLifeServiceImpl.createWithModel(entity);
-	    return ResponseHelper.buildResponse(entity);
+	public ResponseModel<Object> save(@RequestBody JSONObject map) {
+		ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+		return ResponseHelper.buildResponse(jgOverDesignServiceLifeServiceImpl.saveOrUpdate(map, reginParams));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -265,5 +265,5 @@ public interface ICommonService {
 
     void getRegistrationFormStream(JSONObject formData,String manageType,HttpServletResponse response);
 
-    Map<String, Object> getRegistrationChangeCertificateUrl(String manageType ,JSONObject formData);
+    Map<String, Object> getRegistrationChangeCertificateUrl(JSONObject formData);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -34,6 +34,7 @@ public enum ApplicationFormTypeEnum {
     BF("BF", "BF_ZX"),//电梯（设备）报废注销
     GMBG("GMBG", "DJ_GM"),//更名变更
     SBQY("SBQY", "SB_QY"),//设备启用
+    CSJ("CSJ", "DJ_CSJ"),//超设计年限
     SBTY("SBTY", "SB_TY");//设备启用
 
     /**