车型查询配置修改

src/main/java/com/ydtech/modules/admin/controller/SysQueryVehicleConfigController.java

@@ -3,9 +3,9 @@ package com.ydtech.modules.admin.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.model.dto.SysQueryVehicleConfigQueryDTO;
 import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
 import com.ydtech.modules.admin.model.po.SysQuotationTheme;
+import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigQueryPageVo;
 import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigQueryVo;
 import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigSaveVo;
 import com.ydtech.modules.admin.service.SysQueryVehicleConfigService;
@@ -32,16 +32,16 @@ public class SysQueryVehicleConfigController {
 
     @ApiOperation(value = "分页查询")
     @PostMapping("inquire")
-    public HttpResult<BasePageResult<SysQueryVehicleConfig>> inquire(@RequestBody SysQueryVehicleConfigQueryVo sysQueryVehicleConfigQueryVo) {
+    public HttpResult<BasePageResult<SysQueryVehicleConfig>> inquire(@RequestBody SysQueryVehicleConfigQueryPageVo sysQueryVehicleConfigQueryVo) {
         BasePageResult<SysQueryVehicleConfig> inquire = sysQueryVehicleConfigService.inquire(sysQueryVehicleConfigQueryVo);
         return HttpResult.ok(inquire);
     }
 
     @ApiOperation(value = "查询单个配置信息")
     @GetMapping("/{id}")
-    public HttpResult<SysQueryVehicleConfigQueryDTO> queryById(@PathVariable Integer id) {
-        SysQueryVehicleConfigQueryDTO sysQueryVehicleConfigQueryDTO = sysQueryVehicleConfigService.queryById(id);
-        return HttpResult.ok(sysQueryVehicleConfigQueryDTO);
+    public HttpResult<SysQueryVehicleConfigQueryVo> queryById(@PathVariable Integer id) {
+        SysQueryVehicleConfigQueryVo sysQueryVehicleConfigQueryVo = sysQueryVehicleConfigService.queryById(id);
+        return HttpResult.ok(sysQueryVehicleConfigQueryVo);
     }
 
     @ApiOperation(value = "删除")

src/main/java/com/ydtech/modules/admin/dao/SysQueryVehicleConfigMapper.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.dto.SysQueryVehicleConfigDTO;
 import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
 
 /**
@@ -11,6 +12,10 @@ import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
 */
 public interface SysQueryVehicleConfigMapper extends BaseMapper<SysQueryVehicleConfig> {
 
+
+    SysQueryVehicleConfigDTO getByType(String type);
+
+
 }
 
 

src/main/java/com/ydtech/modules/admin/model/dto/SysQueryVehicleConfigDTO.java

@@ -0,0 +1,42 @@
+package com.ydtech.modules.admin.model.dto;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("配置信息")
+public class SysQueryVehicleConfigDTO {
+
+    @ApiModelProperty("保险公司id")
+    private String companyId;
+
+    @ApiModelProperty("保险公司名称")
+    private String companyName;
+
+    @ApiModelProperty("请求地址")
+    private String url;
+
+    @ApiModelProperty("是否开启 0 开启 1 未开启")
+    private Integer enabled;
+
+    @ApiModelProperty("保险公司核心用户名")
+    private String username;
+
+    @ApiModelProperty("保险公司核心密码")
+    private String password;
+
+    @ApiModelProperty("配置类型")
+    private Integer type;
+
+    @ApiModelProperty("请求路劲")
+    private String link;
+
+}

src/main/java/com/ydtech/modules/admin/model/dto/SysQueryVehicleConfigQueryDTO.java

@@ -1,29 +0,0 @@
-package com.ydtech.modules.admin.model.dto;
-
-
-import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
-import com.ydtech.modules.admin.model.po.SysQueryVehicleUrl;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("单独查询实体")
-public class SysQueryVehicleConfigQueryDTO implements Serializable {
-
-    private static final long serialVersionUID = 5588764078957578412L;
-
-    @ApiModelProperty("配置信息")
-    private SysQueryVehicleConfig sysQueryVehicleConfig;
-
-    @ApiModelProperty("链接信息")
-    private List<SysQueryVehicleUrl> sysQueryVehicleUrlList;
-
-}

src/main/java/com/ydtech/modules/admin/model/vo/SysQueryVehicleConfigQueryPageVo.java

@@ -0,0 +1,28 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import com.ydtech.core.page.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("车型查询配置实体")
+public class SysQueryVehicleConfigQueryPageVo extends BasePageVO {
+
+    private static final long serialVersionUID = 1585826286550153895L;
+
+    @ApiModelProperty("保险公司id")
+    private String companyId;
+
+    @ApiModelProperty("是否开启 0 开启 1 未开启")
+    private Integer enabled;
+
+
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysQueryVehicleConfigQueryVo.java

@@ -1,28 +1,29 @@
 package com.ydtech.modules.admin.model.vo;
 
 
-import com.ydtech.core.page.BasePageVO;
+import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
+import com.ydtech.modules.admin.model.po.SysQueryVehicleUrl;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-@EqualsAndHashCode(callSuper = true)
+import java.io.Serializable;
+import java.util.List;
+
 @Data
-@NoArgsConstructor
 @AllArgsConstructor
-@ApiModel("车型查询配置实体")
-public class SysQueryVehicleConfigQueryVo extends BasePageVO {
-
-    private static final long serialVersionUID = 1585826286550153895L;
+@NoArgsConstructor
+@ApiModel("单独查询实体")
+public class SysQueryVehicleConfigQueryVo implements Serializable {
 
-    @ApiModelProperty("保险公司id")
-    private String companyId;
+    private static final long serialVersionUID = 5588764078957578412L;
 
-    @ApiModelProperty("是否开启 0 开启 1 未开启")
-    private Integer enabled;
+    @ApiModelProperty("配置信息")
+    private SysQueryVehicleConfig sysQueryVehicleConfig;
 
+    @ApiModelProperty("链接信息")
+    private List<SysQueryVehicleUrl> sysQueryVehicleUrlList;
 
 }

src/main/java/com/ydtech/modules/admin/service/SysQueryVehicleConfigService.java

@@ -1,11 +1,8 @@
 package com.ydtech.modules.admin.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.extension.BaseIService;
-import com.ydtech.modules.admin.model.dto.SysQueryVehicleConfigQueryDTO;
 import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
-import com.ydtech.modules.admin.model.po.SysQueryVehicleUrl;
+import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigQueryPageVo;
 import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigQueryVo;
 import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigSaveVo;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -27,9 +24,9 @@ public interface SysQueryVehicleConfigService extends BaseIService<SysQueryVehic
     /**
      * 查询
      *
-     * @param sysQueryVehicleConfigQueryVo 车险查询配置实体
+     * @param sysQueryVehicleConfigQueryPageVo 车险查询配置实体
      */
-    BasePageResult<SysQueryVehicleConfig> inquire(SysQueryVehicleConfigQueryVo sysQueryVehicleConfigQueryVo);
+    BasePageResult<SysQueryVehicleConfig> inquire(SysQueryVehicleConfigQueryPageVo sysQueryVehicleConfigQueryPageVo);
 
     /**
      * 删除
@@ -51,7 +48,7 @@ public interface SysQueryVehicleConfigService extends BaseIService<SysQueryVehic
      * @param id 配置信息id
      * @return 配置信息
      */
-    SysQueryVehicleConfigQueryDTO queryById(Integer id);
+    SysQueryVehicleConfigQueryVo queryById(Integer id);
 
 
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysQueryVehicleConfigServiceImpl.java

@@ -1,28 +1,23 @@
 package com.ydtech.modules.admin.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.admin.dao.SysQueryVehicleConfigMapper;
-import com.ydtech.modules.admin.model.dto.SysQueryVehicleConfigQueryDTO;
 import com.ydtech.modules.admin.model.po.SysQueryVehicleConfig;
 import com.ydtech.modules.admin.model.po.SysQueryVehicleUrl;
+import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigQueryPageVo;
 import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigQueryVo;
 import com.ydtech.modules.admin.model.vo.SysQueryVehicleConfigSaveVo;
 import com.ydtech.modules.admin.service.SysQueryVehicleConfigService;
 import com.ydtech.modules.admin.service.SysQueryVehicleUrlService;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author Administrator
@@ -46,7 +41,7 @@ public class SysQueryVehicleConfigServiceImpl extends ServiceImpl<SysQueryVehicl
     }
 
     @Override
-    public BasePageResult<SysQueryVehicleConfig> inquire(SysQueryVehicleConfigQueryVo sysQueryVehicleConfigQueryVo) {
+    public BasePageResult<SysQueryVehicleConfig> inquire(SysQueryVehicleConfigQueryPageVo sysQueryVehicleConfigQueryVo) {
         Page<SysQueryVehicleConfig> page = new Page<>(sysQueryVehicleConfigQueryVo.getPageNum(), sysQueryVehicleConfigQueryVo.getPageSize());
         Page<SysQueryVehicleConfig> sysQueryVehicleConfigPage = lambdaQuery().eq(SysQueryVehicleConfig::getCompanyId, sysQueryVehicleConfigQueryVo.getCompanyId()).eq(SysQueryVehicleConfig::getEnabled, sysQueryVehicleConfigQueryVo.getEnabled()).page(page);
         return new BasePageResult<>(sysQueryVehicleConfigQueryVo.getPageNum(), sysQueryVehicleConfigQueryVo.getPageSize(), sysQueryVehicleConfigPage.getTotal(), sysQueryVehicleConfigPage.getPages(), sysQueryVehicleConfigPage.getRecords());
@@ -79,15 +74,17 @@ public class SysQueryVehicleConfigServiceImpl extends ServiceImpl<SysQueryVehicl
     }
 
     @Override
-    public SysQueryVehicleConfigQueryDTO queryById(Integer id) {
+    public SysQueryVehicleConfigQueryVo queryById(Integer id) {
         SysQueryVehicleConfig sysQueryVehicleConfig = getByIdExist(id, "查询配置信息不存在");
-        SysQueryVehicleConfigQueryDTO sysQueryVehicleConfigQueryDTO = new SysQueryVehicleConfigQueryDTO();
+        SysQueryVehicleConfigQueryVo sysQueryVehicleConfigQueryDTO = new SysQueryVehicleConfigQueryVo();
         sysQueryVehicleConfigQueryDTO.setSysQueryVehicleConfig(sysQueryVehicleConfig);
         List<SysQueryVehicleUrl> list = sysQueryVehicleUrlService.lambdaQuery().eq(SysQueryVehicleUrl::getConfigId, id).list();
         sysQueryVehicleConfigQueryDTO.setSysQueryVehicleUrlList(list);
         return sysQueryVehicleConfigQueryDTO;
     }
 
+
+
 }
 
 

src/main/resources/mapper/modules/admin/SysQueryVehicleConfigMapper.xml

@@ -20,4 +20,8 @@
         password
     </sql>
 
+    <select id="getByType" resultType="com.ydtech.modules.admin.model.dto.SysQueryVehicleConfigDTO">
+
+    </select>
+
 </mapper>

src/main/resources/mapper/modules/admin/SysQueryVehicleUrlMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="generator.mapper.SysQueryVehicleUrlMapper">
+<mapper namespace="com.ydtech.modules.admin.dao.SysQueryVehicleUrlMapper">
 
-    <resultMap id="BaseResultMap" type="generator.domain.SysQueryVehicleUrl">
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.admin.model.po.SysQueryVehicleUrl">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="type" column="type" jdbcType="INTEGER"/>
             <result property="link" column="link" jdbcType="VARCHAR"/>
@@ -15,4 +15,5 @@
         id,type,link,
         config_id
     </sql>
+
 </mapper>