销售订单上装逻辑

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeign.java

@@ -25,16 +25,15 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basevehinstallmodel;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * Project: anrui-base(上装配置管理) <br/>
@@ -76,4 +75,9 @@ public interface BaseVehinstallmodelFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseVehinstallmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("获取上装配置列表")
+    @PostMapping("/getAppTopConfigList")
+    @ResponseBody
+    ResultBean<PagerVo<VehinstallModelVo>> getAppTopConfigList(@RequestBody PagerQuery<VehinstallModelQuery> pagerQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelFeignFallback.java

@@ -69,4 +69,9 @@ public class BaseVehinstallmodelFeignFallback implements BaseVehinstallmodelFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basevehinstallmodel/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<VehinstallModelVo>> getAppTopConfigList(PagerQuery<VehinstallModelQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/VehinstallModelQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/24 14:45
+ * @Description
+ */
+@Data
+public class VehinstallModelQuery implements Query {
+    private static final long serialVersionUID = -1132729564214997561L;
+
+    private String names;
+
+    private String orgPath;
+
+    private String userSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/VehinstallModelVo.java

@@ -0,0 +1,48 @@
+package com.yxt.anrui.base.api.basevehinstallmodel;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/24 14:45
+ * @Description
+ */
+@Data
+public class VehinstallModelVo implements Vo {
+    private static final long serialVersionUID = 4387728207494646822L;
+
+    private String sid;
+    //上装名称
+    private String installNameKey;
+    private String installNameValue;
+    //委改方式
+    private String refitMethodKey;
+    private String refitMethodValue;
+    //颜色
+    private String colorKey;
+    private String colorValue;
+    //外廓尺寸长宽高
+    private String wk_long;
+    private String wk_wide;
+    private String wk_high;
+    //板材材质
+    private String plateMaterialKey;
+    private String plateMaterialValue;
+    //板材厚度
+    private String plateThicknessBottom;
+    private String plateThicknessEdge;
+    //篷布滑道
+    private String tarpaulinSlide;
+    //冷藏冷机
+    private String refrigerator;
+    //自卸液压盖板
+    private String selfUnHyCoPl;
+    //底板加热
+    private String floorHeating;
+    //更多配置
+    private String moreConfig;
+
+    private String refitFactory;
+    private String vehicleTypeValue;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.java

@@ -26,9 +26,11 @@
 package com.yxt.anrui.base.biz.basevehinstallmodel;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -66,4 +68,6 @@ public interface BaseVehinstallmodelMapper extends BaseMapper<BaseVehinstallmode
 
 	@Update("update base_vehinstallmodel set isDelete = 1 where sid = #{sid}")
     int updateBySid(String sid);
+
+    IPage<VehinstallModelVo> getAppTopConfigList(IPage<BaseVehinstallmodel> page,  @Param(Constants.WRAPPER)QueryWrapper<BaseVehinstallmodel> qw, @Param("names") String names);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelMapper.xml

@@ -10,4 +10,20 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo">
 		SELECT * FROM base_vehinstallmodel <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="getAppTopConfigList" resultType="com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo">
+		select * from base_vehinstallmodel
+		<where>
+			${ew.sqlSegment}
+			<if test="names != null and names != ''">
+				and concat(IFNULL(vehicleTypeValue
+				, '')
+				, ifnull(installNameValue
+				, '')) LIKE concat('%'
+				, #{names}
+				, '%')
+			</if>
+			order by id desc
+		</where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.basevehinstallmodel;
 
+import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo;
+import com.yxt.anrui.base.api.basevehinstallmodel.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -34,14 +36,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelQuery;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDto;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
-
 import javax.validation.Valid;
 
 /**
@@ -120,4 +114,11 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign {
 		BaseVehinstallmodelDetailsVo vo = baseVehinstallmodelService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<PagerVo<VehinstallModelVo>> getAppTopConfigList(PagerQuery<VehinstallModelQuery> pagerQuery) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<VehinstallModelVo> pv = baseVehinstallmodelService.getAppTopConfigList(pagerQuery);
+		return rb.success().setData(pv);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java

@@ -28,19 +28,14 @@ package com.yxt.anrui.base.biz.basevehinstallmodel;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
+import com.yxt.anrui.base.api.basevehinstallmodel.*;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelQuery;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelVo;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDto;
-import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
-
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -60,6 +55,8 @@ import java.util.List;
  */
 @Service
 public class BaseVehinstallmodelService extends MybatisBaseService<BaseVehinstallmodelMapper, BaseVehinstallmodel> {
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
 
 	public PagerVo<BaseVehinstallmodelVo> listPageVo(PagerQuery<BaseVehinstallmodelQuery> pq) {
 		BaseVehinstallmodelQuery query = pq.getParams();
@@ -137,4 +134,23 @@ public class BaseVehinstallmodelService extends MybatisBaseService<BaseVehinstal
 			baseMapper.updateBySid(sid);
 		}
 	}
+
+	public PagerVo<VehinstallModelVo> getAppTopConfigList(PagerQuery<VehinstallModelQuery> pagerQuery) {
+		IPage<BaseVehinstallmodel> page = PagerUtil.queryToPage(pagerQuery);
+		VehinstallModelQuery params = pagerQuery.getParams();
+		QueryWrapper<BaseVehinstallmodel> qw = new QueryWrapper<>();
+		if (params != null) {
+			String orgPath = "";
+			if (StringUtils.isBlank(params.getOrgPath())) {
+				orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+				qw.eq("useOrgSid", orgPath);
+			} else {
+				orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
+				qw.eq("useOrgSid", orgPath);
+			}
+		}
+		IPage<VehinstallModelVo> pagging = baseMapper.getAppTopConfigList(page, qw, params.getNames());
+		PagerVo<VehinstallModelVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeup.java

@@ -102,4 +102,7 @@ public class BusSalesOrderMakeup extends BaseEntity {
     //高
     private String sizeHigh;
 
+    private String thicknessBottom;
+    private String thicknessEdge;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -50,7 +50,9 @@
                bm.textureKey,
                bm.sizeLong,
                bm.sizeWide,
-               bm.sizeHigh
+               bm.sizeHigh,
+               bm.thicknessBottom,
+               bm.thicknessEdge
         from bus_sales_order_makeup bm
                  left join bus_sales_order b on bm.salesOrderSid = b.sid
         where salesOrderSid = #{sid}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -255,6 +255,49 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
                             //板材厚度
                             busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
+                            busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
+                            busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
+                            //上装价格
+                            //更多配置
+                            busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
+                            //颜色
+                            busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue());
+                            busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey());
+                            //篷布滑道
+                            busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide());
+                            //冷藏冷机
+                            busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator());
+                            //自卸液压盖板
+                            busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl());
+                            //地板加热
+                            busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating());
+                            busSalesOrderMakeupService.insert(busSalesOrderMakeup);
+                            busSalesOrderService.updateMakeUp(salesOrderSid,"1");
+                        }else{
+                            busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
+                            //新增上装
+                            BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
+                            BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
+                            busSalesOrderMakeup.setSalesOrderSid(salesOrderSid);
+                            //上装名称
+                            busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue());
+                            busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey());
+                            //委改方式
+                            busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue());
+                            busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey());
+                            //委改厂
+                            busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory());
+                            //外廓尺寸
+                            busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long());
+                            busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide());
+                            busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high());
+                            //板材材质
+                            busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue());
+                            busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
+                            //板材厚度
+                            busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
+                            busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
+                            busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                             //上装价格
                             //更多配置
                             busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
@@ -296,6 +339,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                     busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
                     //板材厚度
                     busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
+                    busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
+                    busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                     //上装价格
                     //更多配置
                     busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
@@ -346,6 +391,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
                             //板材厚度
                             busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
+                            busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
+                            busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                             //上装价格
                             //更多配置
                             busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());
@@ -387,6 +434,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                     busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey());
                     //板材厚度
                     busSalesOrderMakeup.setPlateThickness("底：" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边：" + baseVehinstallmodel.getPlateThicknessEdge() + "mm");
+                    busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom());
+                    busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge());
                     //上装价格
                     //更多配置
                     busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig());

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -184,4 +184,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     String selectIdBySid(@Param("list") List<String> stringList);
 
     List<SysUserVo> getUserMessageByRole(@Param("roleSid") String roleSid,@Param("levelOrgSid") String levelOrgSid, @Param("list") List<String> stringList);
+
+    int updateAppIdNull(String appId);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -350,4 +350,9 @@
             #{item}
         </foreach>
     </select>
+
+    <update id="updateAppIdNull">
+        update sys_user set appId = NULL WHERE appId = #{appId} and isDelete = 0
+        and userType = 1
+    </update>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -1140,4 +1140,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     public List<String> getPost(String staffSid) {
         return sysStaffPostService.getPost(staffSid);
     }
+
+    public int updateAppIdNull(String appId) {
+        return baseMapper.updateAppIdNull(appId);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -86,6 +86,8 @@ public class AppSysUserRest implements AppSysUserFeign {
             isTest = userQuery.getIsTest();
         }
         if (isTest) {//添加测试版
+            //将该appId的所有账号的appId都置为空
+            sysUserService.updateAppIdNull(appId);
             SysUser sysUser = sysUserService.selectByUserNameApp(userName);
             if (sysUser == null) {
                 sysUser = sysUserService.selectByMobile(userName);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java

@@ -80,4 +80,7 @@ public class TopDto implements Dto {
     //高
     private String sizeHigh;
 
+    private String thicknessBottom;
+    private String thicknessEdge;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java

@@ -66,4 +66,7 @@ public class TopVo implements Vo {
     private String sizeWide;
     //高
     private String sizeHigh;
+
+    private String thicknessBottom;
+    private String thicknessEdge;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.terminal.api.base.common;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -27,4 +30,9 @@ public interface CommonFeign {
     @ResponseBody
     @GetMapping("/publicModel")
     ResultBean<List<PublicModelVo>> getPublicModelList(@RequestParam("modelSid") String modelSid);
+
+    @ApiOperation(value = "获取上装配置")
+    @ResponseBody
+    @GetMapping("/getAppTopConfigList")
+    ResultBean<PagerVo<TopConfigVo>> getAppTopConfigList(@RequestBody PagerQuery<TopConfigQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/TopConfigQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.base.common;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/24 14:31
+ * @Description
+ */
+@Data
+public class TopConfigQuery implements Query {
+    private static final long serialVersionUID = -6258907526840975117L;
+
+    private String names;
+    private String userSid;
+
+    private String orgPath;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/TopConfigVo.java

@@ -0,0 +1,68 @@
+package com.yxt.anrui.terminal.api.base.common;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/24 12:11
+ * @Description
+ */
+@Data
+public class TopConfigVo implements Vo {
+    private static final long serialVersionUID = -1300650549994365884L;
+    @JsonProperty("topSid")
+    private String sid;
+    //上装名称
+    @JsonProperty("topNameKey")
+    private String installNameKey;
+    @JsonProperty("topName")
+    private String installNameValue;
+    //委改方式
+    @JsonProperty("commissionReformTypeKey")
+    private String refitMethodKey;
+    @JsonProperty("commissionReformType")
+    private String refitMethodValue;
+    //颜色
+    @JsonProperty("colorKey")
+    private String colorKey;
+    @JsonProperty("color")
+    private String colorValue;
+    //外廓尺寸长宽高
+    @JsonProperty("sizeLong")
+    private String wk_long;
+    @JsonProperty("sizeWide")
+    private String wk_wide;
+    @JsonProperty("sizeHigh")
+    private String wk_high;
+    //板材材质
+    @JsonProperty("textureKey")
+    private String plateMaterialKey;
+    @JsonProperty("texture")
+    private String plateMaterialValue;
+    //板材厚度
+    @JsonProperty("thicknessBottom")
+    private String plateThicknessBottom;
+    @JsonProperty("thicknessEdge")
+    private String plateThicknessEdge;
+    //篷布滑道
+    @JsonProperty("tarpaulinSlide")
+    private String tarpaulinSlide;
+    //冷藏冷机
+    @JsonProperty("refirgerator")
+    private String refrigerator;
+    //自卸液压盖板
+    @JsonProperty("selfUnHyCoPl")
+    private String selfUnHyCoPl;
+    //底板加热
+    @JsonProperty("floorHeating")
+    private String floorHeating;
+    //更多配置
+    private String moreConfig;
+    @JsonProperty("commissionReformManufactor")
+    private String refitFactory;
+    @JsonProperty("vehicleFunctions")
+    private String vehicleTypeValue;
+
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -2,7 +2,11 @@ package com.yxt.anrui.terminal.biz.base.common;
 
 import com.yxt.anrui.terminal.api.base.common.CommonFeign;
 import com.yxt.anrui.terminal.api.base.common.PublicModelVo;
+import com.yxt.anrui.terminal.api.base.common.TopConfigQuery;
+import com.yxt.anrui.terminal.api.base.common.TopConfigVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -27,4 +31,9 @@ public class CommonRest implements CommonFeign {
     public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid) {
         return commonService.getPublicModelList(modelSid);
     }
+
+    @Override
+    public ResultBean<PagerVo<TopConfigVo>> getAppTopConfigList(PagerQuery<TopConfigQuery> pagerQuery) {
+        return commonService.getAppTopConfigList(pagerQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -1,10 +1,19 @@
 package com.yxt.anrui.terminal.biz.base.common;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelFeign;
+import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelQuery;
+import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign;
 import com.yxt.anrui.terminal.api.base.common.PublicModelVo;
+import com.yxt.anrui.terminal.api.base.common.TopConfigQuery;
+import com.yxt.anrui.terminal.api.base.common.TopConfigVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +32,8 @@ public class CommonService {
 
     @Autowired
     private BaseVehmodelAnnouncementmodelFeign baseVehmodelAnnouncementmodelFeign;
+    @Autowired
+    private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
 
     public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid) {
         ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
@@ -30,4 +41,15 @@ public class CommonService {
         List<PublicModelVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
+
+    public ResultBean<PagerVo<TopConfigVo>> getAppTopConfigList(PagerQuery<TopConfigQuery> pagerQuery) {
+        ResultBean<PagerVo<TopConfigVo>> rb = ResultBean.fireFail();
+        PagerQuery<VehinstallModelQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<VehinstallModelVo>> resultBean = baseVehinstallmodelFeign.getAppTopConfigList(pq);
+        List<TopConfigVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), TopConfigVo.class)).collect(Collectors.toList());
+        PagerVo<TopConfigVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(resultBean.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
+    }
 }