Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -63,6 +63,7 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "价格")
 	private BigDecimal price;
 
+	
 	//总押金
 	@Column(name = "deposit")
 	@ApiModelProperty(value = "总押金")
@@ -122,17 +123,8 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
 	private Integer hotSign;
 
-    @ApiModelProperty(value = "总数量")
-     private Integer sum;
-
-
-    @ApiModelProperty(value = "可租借数量")
-    private Integer leasableQuantity;
-
-
-    @ApiModelProperty(value = "车辆")
-    private  Vehicle vehicle;
-
+	@ApiModelProperty(value = "是否删除")
+	private  Integer isdel;
 	@Column(name = "rent_discount_status")
 	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")
 	private Integer rentDiscountStatus;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java

@@ -3,6 +3,10 @@ package com.xxfc.platform.vehicle.pojo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+/**
+ * 车型查询条件bean
+ * @author Administrator
+ */
 @Data
 public class VehicleModelQueryCondition {
     @ApiModelProperty(value = "当前页")
@@ -15,6 +19,7 @@ public class VehicleModelQueryCondition {
     private String  vehicleName;
     @ApiModelProperty(value = "乘卧数")
     private String  takeALieTheNumber;
-
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDel;
 
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

+package com.xxfc.platform.vehicle.pojo;
+
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * 车型
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-05-25 14:50:08
+ */
+@Data
+@Table(name = "vehicle_model")
+public class VehicleModelVo implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	    //主键
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+
+	    //名称
+    @Column(name = "name")
+	@ApiModelProperty(value = "名称")
+    private String name;
+
+	    //房车配置，code逗号分割
+    @Column(name = "config")
+	@ApiModelProperty(value = "房车配置，code逗号分割")
+    private String config;
+
+	    //关键标签，code逗号分割
+    @Column(name = "keyword")
+	@ApiModelProperty(value = "关键标签，code逗号分割")
+    private String keyword;
+
+		//车型详情
+	@Column(name = "models_details")
+	@ApiModelProperty(value = "车型详情")
+	private String modelsDetails;
+
+		//参数
+	@Column(name = "model_param")
+	@ApiModelProperty(value = "参数")
+	private String modelParam;
+
+	    //图片地址 多张为逗号分割
+    @Column(name = "picture")
+	@ApiModelProperty(value = "图片地址 多张为逗号分割")
+    private String picture;
+
+	//价格
+	@Column(name = "price")
+	@ApiModelProperty(value = "价格")
+	private BigDecimal price;
+
+	//会员价格
+	@Column(name = "vip_price")
+	@ApiModelProperty(value = "会员价格")
+	private BigDecimal vipPrice;
+
+	//总押金
+	@Column(name = "deposit")
+	@ApiModelProperty(value = "总押金")
+	private BigDecimal deposit;
+
+	//违章押金
+	@Column(name = "vio_deposit")
+	@ApiModelProperty(value = "违章押金")
+	private BigDecimal vioDeposit;
+
+	    //创建时间
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Date crtTime;
+
+	    //创建者id
+    @Column(name = "crt_user")
+	@ApiModelProperty(value = "创建者id")
+    private Integer crtUser;
+
+	    //创建者名称
+    @Column(name = "crt_name")
+	@ApiModelProperty(value = "创建者名称")
+    private String crtName;
+
+	    //创建者host
+    @Column(name = "crt_host")
+	@ApiModelProperty(value = "创建者host")
+    private String crtHost;
+
+	    //修改时间
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "修改时间", hidden = true )
+    private Date updTime;
+
+	    //修改者
+    @Column(name = "upd_user")
+	@ApiModelProperty(value = "修改者")
+    private Integer updUser;
+
+	    //修改者名称
+    @Column(name = "upd_name")
+	@ApiModelProperty(value = "修改者名称")
+    private String updName;
+
+	    //修改者host
+    @Column(name = "upd_host")
+	@ApiModelProperty(value = "修改者host")
+    private String updHost;
+
+	//评分
+	@Column(name = "score")
+	@ApiModelProperty(value = "评分")
+	private Integer score;
+
+	@Column(name = "hot_sign")
+	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
+	private Integer hotSign;
+
+
+	@ApiModelProperty(value = "是否删除")
+	private  Integer isdel;
+
+	@ApiModelProperty(value = "总数量")
+	private Integer sum;
+
+
+	@ApiModelProperty(value = "可租借数量")
+	private Integer leasableQuantity;
+
+
+	@ApiModelProperty(value = "车辆")
+	private  Vehicle vehicle;
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCataBiz.java

@@ -6,10 +6,8 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.mapper.VehicleCataMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,6 +54,8 @@ public class VehicleCataBiz extends BaseBiz<VehicleCataMapper, VehicleCata> {
     }
 
 
-
+    public void inserts(ArrayList<com.xxfc.platform.vehicle.entity.VehicleCata> vcs) {
+        mapper.addCataList(vcs);
+    }
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -21,27 +22,46 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class VehicleModelBiz extends BaseBiz<VehicleModelMapper,VehicleModel> {
+public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
 
 
     //添加评分
-    public void addScore(Integer id,Integer score){
-        VehicleModel model=new VehicleModel();
+    public void addScore(Integer id, Integer score) {
+        VehicleModel model = new VehicleModel();
         model.setId(id);
         model.setScore(score);
         updateSelectiveById(model);
     }
 
-    public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc){
+    public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc) {
 
-        List<VehicleModel> vehicleModelPage = mapper.findVehicleModelPage(vmqc);
+//        List<VehicleModelVo > vehicleModelPage = mapper.findVehicleModelPage(vmqc);
 
-    log.debug("vehicleModelPage"+vehicleModelPage);
+//    log.debug("vehicleModelPage"+vehicleModelPage);
 
-        PageDataVO<VehicleModel> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
-                vmqc.getLimit(), ()  -> mapper.findVehicleModelPage(vmqc));
 
-        return ObjectRestResponse.succ(mPageDataVO);
+        try {
+            PageDataVO<VehicleModel> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
+                    vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
+
+            return ObjectRestResponse.succ(mPageDataVO);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ObjectRestResponse.createDefaultFail();
+
+    }
+
+
+    public Integer insertAndGetId(VehicleModel vm) {
+        try {
+            mapper.insertSelective(vm);
+            return vm.getId();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+
     }
 
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -31,8 +31,6 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
 
     @Autowired
     VehicleCataBiz vehicleCataBiz;
-
-
     //更新
     @Transactional
     @CacheClear(pre = RedisKey.BRANCH_CATA_CACHE)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleCataMapper.java

@@ -23,5 +23,5 @@ public interface VehicleCataMapper extends Mapper<VehicleCata> {
     //获取一条
     VehicleCata getOne(@Param("vehicleModelId")Integer vehicleModelId,@Param("cataId")Integer cataId );
 
-	
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleModelMapper.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -15,5 +16,6 @@ import java.util.List;
  */
 public interface VehicleModelMapper extends Mapper<VehicleModel> {
 
-    List<VehicleModel> findVehicleModelPage(VehicleModelQueryCondition vmqc);
+    List<VehicleModelVo> findVehicleModelPage(VehicleModelQueryCondition vmqc);
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -2,15 +2,16 @@ package com.xxfc.platform.vehicle.rest;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
@@ -18,45 +19,48 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
 
 @RestController
 @RequestMapping("vehicleModel")
-@Api(value="车型controller",tags={"车型操作接口"})
-public class VehicleModelController extends BaseController<VehicleModelBiz,VehicleModel> {
+@Api(value = "车型controller", tags = {"车型操作接口"})
+public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> {
 
     @Autowired
     private VehiclePlatCataBiz vehiclePlatCataBiz;
 
     @Autowired
-    private VehicleModelBiz  vehicleModelBiz;
-    
+    VehicleCataBiz vehicleCataBiz;
+
+    @Autowired
+    private VehicleModelBiz vehicleModelBiz;
+
     @Autowired
     private UserFeign userFeign;
 
     //修改评分
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
     public RestResponse addScore(
-            @RequestParam(value="id",defaultValue="0")Integer  id,
-            @RequestParam(value="score",defaultValue="0")Integer  score){
-            baseBiz.addScore(id,score);
-            return RestResponse.suc();
+            @RequestParam(value = "id", defaultValue = "0") Integer id,
+            @RequestParam(value = "score", defaultValue = "0") Integer score) {
+        baseBiz.addScore(id, score);
+        return RestResponse.suc();
     }
 
     //订单
     @ApiOperation("车型详情")
     @RequestMapping(value = "/app/unauth/detail/{id}", method = RequestMethod.GET)
-    public ObjectRestResponse<VModelDetailVO> detail(@PathVariable("id") @ApiParam("车型id") Integer id){
+    public ObjectRestResponse<VModelDetailVO> detail(@PathVariable("id") @ApiParam("车型id") Integer id) {
         //查询车型信息，车型类型关系
         //，公司信息，系统信息（购车须知，预定须知）
         VehicleModel vm = baseBiz.selectById(id);
-        if(null == vm)
+        if (null == vm)
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         VModelDetailVO vModelDetailVO = BeanUtil.toBean(vm, VModelDetailVO.class);
         vModelDetailVO.setVehiclePlatCatas(vehiclePlatCataBiz.getByModelId(vm.getId()));
@@ -73,7 +77,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz,Vehic
     @PostMapping(value = "/app/findVehicleModelPage")
     public ObjectRestResponse<VModelDetailVO> findVehicleModelPage(
             @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc) {
-
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
             return ObjectRestResponse.createDefaultFail();
         }
@@ -83,45 +86,117 @@ public class VehicleModelController extends BaseController<VehicleModelBiz,Vehic
 
     /**
      * 添加车型
-     * @param vm 接收前天的数据
+     *
+     * @param vm      bean
      * @param request
      * @return
      */
     @ApiOperation("添加")
-    @PostMapping(value = "add")
+    @PostMapping(value = "/app/add")
     @ResponseBody
-    public ObjectRestResponse<VehicleModel> add(@RequestBody VehicleModel vm,HttpServletRequest request){
-        if (vm==null) {
-           return ObjectRestResponse.createDefaultFail();
+    public ObjectRestResponse<VehicleModel> add(@RequestBody VehicleModel vm, HttpServletRequest request) {
+        if (vm == null) {
+            return ObjectRestResponse.createDefaultFail();
         }
 
         if (StringUtils.isBlank(vm.getName())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无车名");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "无车名");
         }
 
         String token = request.getHeader("Authorization");
-        if (StringUtils.isBlank(token)){
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"请登录");
+        if (StringUtils.isBlank(token)) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "请登录");
         }
         ObjectRestResponse<UserDTO> uorr = userFeign.userinfoByToken(token);
 
-        if (uorr==null||uorr.getData()==null||StringUtils.isBlank(uorr.getData().getName())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"获取不到用户信息");
+        if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
+        }
+        String host = request.getRemoteHost();
+        if (StringUtils.isBlank(host)) {
+            return ObjectRestResponse.createDefaultFail();
         }
+  //设置信息
+        vm.setCrtName(uorr.getData().getName());
+        vm.setCrtUser(uorr.getData().getId());
+        vm.setCrtTime(new Date());
+        vm.setCrtHost(host);
+        vm.setIsdel(0);
+        try {
+            //插入数据到车型并返回id
+            Integer vmId = vehicleModelBiz.insertAndGetId(vm);
+            if (vmId == null) {
+                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "插入数据失败");
+            }
+
+            System.out.println("vmId:" + vmId);
+            //获取该车型所有的标签id
+            ArrayList<VehicleCata> vcs = new ArrayList<>();
+//            获取cataid
+            String[] config = vm.getConfig().split(",");
+            for (String con : config) {
+                VehicleCata vc = new VehicleCata();
+                vc.setVehicleModelId(vmId);
+                vc.setCataId(Integer.parseInt(con));
+                vcs.add(vc);
+            }
+
+            vehicleCataBiz.inserts(vcs);
+            return ObjectRestResponse.succ();
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 
 
-        Integer id = uorr.getData().getId();
-//        vm.set
+    @ApiOperation("修改")
+    @PutMapping(value = "/app/update")
+    @ResponseBody
+    public ObjectRestResponse<VehicleModel> update(@RequestBody VehicleModel vm, HttpServletRequest request) {
+
+        String token = request.getHeader("Authorization");
+        ObjectRestResponse<UserDTO> uorr = userFeign.userinfoByToken(token);
 
-        //获取域名
+        if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
+        }
         String host = request.getRemoteHost();
         if (StringUtils.isBlank(host)) {
             return ObjectRestResponse.createDefaultFail();
         }
+//     插入修改时间
+        vm.setUpdName(uorr.getData().getName());
+        vm.setUpdUser(uorr.getData().getId());
+        vm.setUpdHost(host);
+        vm.setUpdTime(new Date());
+
+        try {
+    //修改车型
+            vehicleModelBiz.updateSelectiveById(vm);
+            VehicleCata vcDelete = new VehicleCata();
+            vcDelete.setVehicleModelId(vm.getId());
+    // 删除车型对应的标签
+            vehicleCataBiz.delete(vcDelete);
+            ArrayList<VehicleCata> vcs = new ArrayList<>();
+    //从新插入车型对应的标签
+//            获取cataid
+            String[] config = vm.getConfig().split(",");
+            for (String con : config) {
+                VehicleCata vc = new VehicleCata();
+                vc.setCataId(Integer.parseInt(con));
+                vc.setVehicleModelId(vm.getId());
+                vcs.add(vc);
+            }
+            vehicleCataBiz.inserts(vcs);
+
+            return ObjectRestResponse.succ();
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
 
-
-        baseBiz.insertSelective(vm);
-        return new ObjectRestResponse<VehicleModel>();
+        return ObjectRestResponse.createDefaultFail();
     }
 
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleModelMapper">
   <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition"
-          resultType="com.xxfc.platform.vehicle.entity.VehicleModel">
+          resultType="com.xxfc.platform.vehicle.pojo.VehicleModelVo">
       SELECT * from
       (select vm.*,v.sum,v2.leasableQuantity from  vehicle_model  vm left JOIN
       (select model_id as mid, count(1) as sum FROM vehicle GROUP BY mid)  v
@@ -10,6 +10,9 @@
       (select model_id as mid2, count(1) as leasableQuantity FROM vehicle where`status`=1 GROUP BY model_id)  v2
       on v.mid=v2.mid2 ) vmqc WHERE 1=1
 
+      <if test="isDel !=null ">
+          and isdel=#{isDel}
+      </if>
       <if test="vehicleName !=null and vehicleName !=''">
         AND  vmqc.name LIKE CONCAT('%',#{vehicleName},'%')
       </if>
@@ -23,5 +26,4 @@
       </if>
       ORDER BY	vmqc.id ASC
   </select>
-
 </mapper>
\ No newline at end of file