1.续保配置

2.归属信息模板配置

src/main/java/com/ydtech/modules/esm/controller/EsmInsAttributionController.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.esm.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,7 +63,7 @@ public class EsmInsAttributionController extends BaseController {
         queryWrapper.eq(EsmInsAttributionTemplate::getInsCompanyId, insCompanyId);
         EsmInsAttributionTemplate template = esmInsAttributionTemplateService.getOne(queryWrapper);
 
-//        if (null == template) return HttpResult.ok("模板不存在，请联系管理员初始化模板");
+        if (null == template) return HttpResult.ok("模板不存在，请联系管理员初始化模板");
 
         return HttpResult.ok(template);
 
@@ -116,7 +116,7 @@ public class EsmInsAttributionController extends BaseController {
             ZmAscriptionVo zmVo = EsmInsAttribution.gainZmAscriptionVo(eia);
             ZmAscriptionResponse zmResponse = zhongMeiOrderService.ascription(zmVo);
             if (null == zmResponse) return HttpResult.ok("归属保存失败，请检查参数是否正确！");
-            aValue = JSONObject.toJSONString(zmResponse);
+            aValue = JSON.toJSONString(zmResponse);
         }
 
         eia.setValue(aValue);

src/main/java/com/ydtech/modules/esm/controller/EsmInsAttributionTemplateController.java

@@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.*;
 /**
  * @author wenks
  * @version 0.0.2
- * @description 归属信息模板管理
+ * @description 归属信息模板配置
  * @date 2023/5/29 10:16
  */
-@Api(tags = "归属信息模板管理")
+@Api(tags = "归属信息模板配置")
 @RestController
 @RequestMapping("/esm/attributionTemplate")
 public class EsmInsAttributionTemplateController {
@@ -51,7 +51,7 @@ public class EsmInsAttributionTemplateController {
 
     @PutMapping("/{id}")
     @ApiOperation("通过id修改模板信息")
-    public HttpResult revise(@PathVariable Long id, EsmInsAttributionTemplateSaveVo esmInsAttributionTemplateSaveVo) {
+    public HttpResult revise(@PathVariable Long id, @RequestBody EsmInsAttributionTemplateSaveVo esmInsAttributionTemplateSaveVo) {
         return esmInsAttributionTemplateService.revise(id, esmInsAttributionTemplateSaveVo);
     }
 

src/main/java/com/ydtech/modules/esm/model/EsmInsAttributionTemplate.java

@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
  *
  * @TableName esm_ins_attribution_template
  */
-@TableName(value = "esm_ins_attribution_template")
+@TableName(value = "esm_ins_attribution_template", autoResultMap = true)
 @NoArgsConstructor
 @Data
 public class EsmInsAttributionTemplate implements Serializable {

src/main/java/com/ydtech/modules/esm/model/vo/EsmInsAttributionTemplateSaveVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.esm.model.vo;
 
+import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,6 +22,6 @@ public class EsmInsAttributionTemplateSaveVo implements Serializable {
     private String insCompanyId;
 
     @ApiModelProperty("字段集")
-    private List<EsmInsAttributionTemplateVo> fields;
+    private List<InsRenewalVo.ConfigureDto> fields;
 
 }

src/main/java/com/ydtech/modules/esm/service/impl/EsmInsAttributionTemplateServiceImpl.java

@@ -34,11 +34,9 @@ public class EsmInsAttributionTemplateServiceImpl extends ServiceImpl<EsmInsAttr
     @Override
     public HttpResult submit(EsmInsAttributionTemplateSaveVo esmInsAttributionTemplateSaveVo) {
         esmInsCompanyService.isExists(esmInsAttributionTemplateSaveVo.getInsCompanyId());
-        EsmInsAttributionTemplate esmInsAttributionTemplate = new EsmInsAttributionTemplate();
-        esmInsAttributionTemplate.setInsCompanyId(esmInsAttributionTemplateSaveVo.getInsCompanyId());
-        esmInsAttributionTemplate.setFields(JSON.parseArray(JSON.toJSONString(esmInsAttributionTemplateSaveVo.getFields())));
+        EsmInsAttributionTemplate esmInsAttributionTemplate = new EsmInsAttributionTemplate(esmInsAttributionTemplateSaveVo);
         baseMapper.insert(esmInsAttributionTemplate);
-        return null;
+        return HttpResult.ok("成功");
     }
 
     @Override

src/main/java/com/ydtech/modules/order/entity/po/InsRenewal.java

@@ -13,13 +13,14 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 
 /**
  * 保险续保
  *
  * @TableName ins_renewal
  */
-@TableName(value = "ins_renewal")
+@TableName(value = "ins_renewal", autoResultMap = true)
 @Data
 @NoArgsConstructor
 public class InsRenewal implements Serializable {
@@ -50,7 +51,7 @@ public class InsRenewal implements Serializable {
     /**
      * 配置参数
      */
-    @TableField(value = "configure", typeHandler = FastjsonTypeHandler.class)
+    @TableField(value = "configure", typeHandler = JacksonTypeHandler.class)
     private JSONArray configure;
 
     /**

src/main/java/com/ydtech/modules/order/entity/request/RenewalRequest.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import com.ydtech.modules.order.entity.vo.QueryRenewalVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -48,7 +49,7 @@ public class RenewalRequest implements Serializable {
     public RenewalRequest(QueryRenewalVo queryRenewalVo) {
         Map<String, String> collect = queryRenewalVo.getConfigure()
                 .stream()
-                .collect(Collectors.toMap(QueryRenewalVo.ConfigureDto::getField, QueryRenewalVo.ConfigureDto::getValue));
+                .collect(Collectors.toMap(InsRenewalVo.ConfigureDto::getField, InsRenewalVo.ConfigureDto::getValue));
 
         this.frameNo = collect.get("frameNo");
         this.licenseNo = collect.get("licenseNo");

src/main/java/com/ydtech/modules/order/entity/vo/InsRenewalVo.java

@@ -1,6 +1,6 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateVo;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,21 +22,56 @@ public class InsRenewalVo implements Serializable {
     private static final long serialVersionUID = -5511337516850645137L;
 
     @NotBlank(message = "保险公司id不能为空")
-    @ApiModelProperty (value = "保险公司Id")
+    @ApiModelProperty(value = "保险公司Id")
     private String companyId;
 
-    @ApiModelProperty (value = "续保请求url")
+    @ApiModelProperty(value = "续保请求url")
     @NotBlank(message = "续保请求url不能为空")
     private String url;
 
-    @ApiModelProperty (value = "是否开启(1开启,0关闭)")
+    @ApiModelProperty(value = "是否开启(1开启,0关闭)")
     private Integer isOpen;
 
-    @ApiModelProperty (value = "配置参数")
-    private List<EsmInsAttributionTemplateVo> configure;
+    @ApiModelProperty(value = "配置参数")
+    private List<ConfigureDto> configure;
 
-    @ApiModelProperty (value = "缩写")
+    @ApiModelProperty(value = "缩写")
     @NotBlank(message = "缩写不能为空")
     private String namesimple;
 
+
+    @Data
+    public static class ConfigureDto implements Serializable {
+
+        private static final long serialVersionUID = 5519839474055384769L;
+        /**
+         * 字段
+         */
+        @ApiModelProperty(value = "字段")
+        private String field;
+
+        /**
+         * 标签
+         */
+        @ApiModelProperty(value = "标签")
+        private String label;
+
+        /**
+         * 类型（text 文本框，select 选择框）
+         */
+        @ApiModelProperty(value = "类型（text 文本框，select 选择框）")
+        private String type;
+
+        /**
+         * 是否允许修改（0 可修改，1 不可修改）
+         */
+        @ApiModelProperty(value = "是否允许修改（true 可修改，false 不可修改）")
+        private boolean isEdit;
+
+
+        @ApiModelProperty(value = "值")
+        private String value;
+
+    }
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/QueryRenewalVo.java

@@ -2,6 +2,8 @@ package com.ydtech.modules.order.entity.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.modules.nai.httpvo.RenewalQueryVO;
+import com.ydtech.modules.order.entity.po.InsRenewal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,32 +26,10 @@ public class QueryRenewalVo implements Serializable {
     private static final long serialVersionUID = -908169760210779014L;
 
 
-    private List<ConfigureDto> configure;
+    private List<InsRenewalVo.ConfigureDto> configure;
 
     @ApiModelProperty("保险公司Id")
     private String companyId;
 
-    @Data
-    public static class ConfigureDto implements Serializable {
-
-        private static final long serialVersionUID = 3187610136465044065L;
-
-        @JsonProperty("type")
-        private String type;
-
-        @JsonProperty("field")
-        private String field;
-
-        @JsonProperty("label")
-        private String label;
-
-        @JsonProperty("value")
-        private String value;
-
-        @JsonProperty("isEdit")
-        private Integer isEdit;
-
-    }
-
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsRenewalServiceImpl.java

@@ -86,8 +86,12 @@ public class InsRenewalServiceImpl extends ServiceImpl<InsRenewalMapper, InsRene
 
     @Override
     public HttpResult manageQuery(BasePageVO basePageVO) {
-        Page<InsRenewal> page = page(new Page<>(basePageVO.getPageNum(), basePageVO.getPageSize()));
-        BasePageResult<InsRenewal> insRenewalBasePageResult = new BasePageResult<>(basePageVO.getPageNum(), page.getSize(), page.getTotal(), page.getPages(), page.getRecords());
+        LambdaQueryWrapper<InsRenewal> wrapper = new LambdaQueryWrapper<>();
+        Page<InsRenewal> page = new Page<>(basePageVO.getPageNum(), basePageVO.getPageSize());
+
+        Page<InsRenewal> insRenewalPage = baseMapper.selectPage(page, wrapper);
+        BasePageResult<InsRenewal> insRenewalBasePageResult = new BasePageResult<>(basePageVO.getPageNum(), page.getSize(), insRenewalPage.getTotal(), insRenewalPage.getPages(), insRenewalPage.getRecords());
+
         return HttpResult.ok(insRenewalBasePageResult);
     }
 

src/main/java/com/ydtech/security/JwtLoginFilter.java

@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 
 /**
@@ -104,7 +105,7 @@ public class JwtLoginFilter extends UsernamePasswordAuthenticationFilter {
         BufferedReader reader = null;
         try {
             inputStream = request.getInputStream();
-            reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+            reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
             String line = "";
             while ((line = reader.readLine()) != null) {
                 sb.append(line);

src/main/resources/application-prod.yml

@@ -119,6 +119,9 @@ server:
       charset: UTF-8
       force: true
 spring:
+  jackson:
+    generator:
+      write_numbers_as_strings: true
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
     druid:

src/main/resources/application-test.yml

@@ -149,6 +149,9 @@ server:
 
 
 spring:
+  jackson:
+    generator:
+      write_numbers_as_strings: true
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
     druid:

src/main/resources/mapper/modules/order/InsRenewalMapper.xml

@@ -5,19 +5,25 @@
 <mapper namespace="com.ydtech.modules.order.dao.InsRenewalMapper">
 
     <resultMap id="BaseResultMap" type="com.ydtech.modules.order.entity.po.InsRenewal">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
-            <result property="url" column="url" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="INTEGER"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+        <result property="url" column="url" jdbcType="VARCHAR"/>
+        <result property="configure" column="configure" javaType="com.alibaba.fastjson.JSONArray"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="isOpen" column="is_open" jdbcType="INTEGER"/>
+        <result property="namesimple" column="namesimple" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="EsmInsCompanyDto" type="com.ydtech.modules.order.entity.dto.EsmInsCompanyDto">
         <id property="id" column="id" jdbcType="INTEGER"/>
         <result property="namesimple" column="namesimple" jdbcType="VARCHAR"/>
-        <result property="configure" column="configure" javaType="com.alibaba.fastjson.JSONArray" typeHandler = "com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result property="configure" column="configure" javaType="com.alibaba.fastjson.JSONArray"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,company_id,url
+        id
+        ,company_id,url
     </sql>
 
     <select id="getByIsOpen" resultMap="EsmInsCompanyDto">