合并本地分支

.gitignore

@@ -7,6 +7,10 @@ target/
 .settings/
 .classpath
 ace-modules/ace-tool/src/main/resources/application-dev.yml
-**/logs
 **/src/test
+**/logs
+xx-order/xx-order-server/logs/**
+*.log
+logs/**
+/src/main/test/**
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -106,6 +106,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
             AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
             if (appUserLogin != null) {
                 dto.setUserId(appUserLogin.getId());
+            }else {
+                return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
         UserDTO userDTO = getAdminUserInfo();

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/ModelDto.java

+package com.xxfc.platform.uccn.dto;
+
+import com.xxfc.platform.uccn.entity.Model;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class ModelDto {
+    private Model parent;
+    private List<Model> list;
+
+    public ModelDto(Model parent, List<Model> list) {
+        this.parent = parent;
+        this.list = list;
+    }
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SeoDTO.java

+package com.xxfc.platform.uccn.dto;
+
+import com.xxfc.platform.uccn.entity.SEO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+@Api
+public class SeoDTO extends SEO {
+
+    @Column(name = "modeName")
+    @ApiModelProperty(value = "模块名称")
+    private String modelName;
+
+    @Column(name = "model_id")
+    @ApiModelProperty(value = "模块id")
+    private Integer modelId;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/Model.java

+package com.xxfc.platform.uccn.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javafx.scene.input.Mnemonic;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Table(name = "model")
+@ApiModel(value = "官网模块实体")
+@NoArgsConstructor
+public class Model implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @Column(name = "parent_id")
+    @ApiModelProperty(value = "父模块id")
+    private Integer parentId;
+
+    @Column(name = "name")
+    @ApiModelProperty(value = "模块名称")
+    private String name;
+
+    @Column(name = "level")
+    @ApiModelProperty(value = "模块等级")
+    private Integer level;
+
+    @Column(name = "cre_time")
+    @ApiModelProperty(value = " 创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creTime;
+
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updTime;
+
+    @Column(name = "is_del")
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDel;
+
+    @Column(name = "rank")
+    @ApiModelProperty(value = "排序")
+    private Integer rank;
+
+    public Model(Integer id) {
+        this.id = id;
+    }
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SEO.java

+package com.xxfc.platform.uccn.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data
+@Table(name = "seo")
+@ApiModel(value = "seo列表实体")
+@NoArgsConstructor
+public class SEO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+
+    @Column(name = "model_id")
+    @ApiModelProperty(value = "模块id")
+    private Integer modelId;
+
+    @Column(name = "title")
+    @ApiModelProperty(value = "title内容")
+    private String title;
+
+    @Column(name = "keywords")
+    @ApiModelProperty(value = "关键子")
+    private String keywords;
+
+    @Column(name = "description")
+    @ApiModelProperty(value = "description内容")
+    private String description;
+
+    @Column(name = "header")
+    @ApiModelProperty(value = "标题")
+    private String header;
+
+
+    @Column(name = "cre_time")
+    @ApiModelProperty(value = " 创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creTime;
+
+    @Column(name = "upd_time")
+    @ApiModelProperty(value = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updTime;
+
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/ModelQuery.java

+package com.xxfc.platform.uccn.vo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ModelQuery {
+    private Integer page  = 1;
+    private Integer limit = 10;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/ModelVo.java

+package com.xxfc.platform.uccn.vo;
+
+import com.xxfc.platform.uccn.entity.Model;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ModelVo {
+    private Integer parentId;
+    private List<Model> list;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SEOQuery.java

+package com.xxfc.platform.uccn.vo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SEOQuery {
+    private Integer page  = 1;
+    private Integer limit = 10;
+}

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SEOVo.java

+package com.xxfc.platform.uccn.vo;
+
+import com.xxfc.platform.uccn.entity.SEO;
+import lombok.Data;
+
+@Data
+public class SEOVo extends SEO {
+
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ModelBackgroundBiz.java

+package com.xxfc.platform.uccn.biz;
+
+import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.uccn.dto.ModelDto;
+import com.xxfc.platform.uccn.entity.Model;
+import com.xxfc.platform.uccn.vo.ModelVo;
+import com.xxfc.platform.uccn.mapper.ModelBackgroundMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class ModelBackgroundBiz extends BaseBiz<ModelBackgroundMapper, Model> {
+    private final Integer BASE_PARENT_ID = 0;
+
+    private final Integer NOT_DELETE = 0;
+
+    private final Integer level=2;
+
+    @Autowired
+    private ApplicationContext context;
+
+    public List<ModelDto> getList() {
+        List<Model> ModelList = getProxy().getListByParentId(BASE_PARENT_ID);
+        if (CollectionUtils.isEmpty(ModelList)) {
+            return new ArrayList<>();
+        }
+        return getModelDtos(ModelList);
+    }
+
+    /**
+     * 获取ModelDto集合
+     * @param models
+     * @return
+     */
+    private ArrayList<ModelDto> getModelDtos(List<Model> models) {
+        ArrayList<ModelDto> modelDtos = new ArrayList<>();
+        for (Model el : models) {
+            if (el.getLevel()==3) {
+                break;
+            }
+            List<Model> list = getListByParentId(el.getId());
+            modelDtos.add(new ModelDto(el, list));
+            modelDtos.addAll(getModelDtos(list));
+        }
+        return modelDtos;
+    }
+
+    /**
+     * 根据父类id获取所有子类集合
+     *
+     * @param parentId
+     * @return
+     */
+//    @Cache(key = "ModelList{1}")
+    public List<Model> getListByParentId(Integer parentId) {
+        Example exa  = new Example(Model.class);
+        Example.Criteria criteria = exa.createCriteria();
+        criteria.andEqualTo("parentId",parentId).andEqualTo("isDel",NOT_DELETE);
+        exa.orderBy("rank").asc();
+        return mapper.selectByExample(exa);
+    }
+
+    /**
+     * 获取代理对象
+     *
+     * @return
+     */
+    private ModelBackgroundBiz getProxy() {
+        return context.getBean(ModelBackgroundBiz.class);
+    }
+
+
+    /**
+     * 修改子模块
+     *
+     * @param Modelvo
+     * @return
+     */
+//    @CacheClear(key = "ModelList{1.Integer}")
+    public String update(ModelVo Modelvo) {
+        if (Modelvo==null||Modelvo.getParentId()==null) {
+            return "无修改数据";
+        }
+        Model Model = selectById(Modelvo.getParentId());
+        if (Model==null||(!Model.getIsDel().equals(NOT_DELETE))||BASE_PARENT_ID.equals(Model.getParentId())) {
+            return "该标签不能修改";
+        }
+
+        if (CollectionUtils.isNotEmpty(Modelvo.getList())) {
+            for (Model el : Modelvo.getList()) {
+                if (el.getId()==null) {
+                    el.setIsDel(NOT_DELETE);
+                    el.setCreTime(new Date());
+                    el.setParentId(Modelvo.getParentId());
+                    if (el.getRank() == null) {
+                        el.setRank(0);
+                    }
+                    mapper.insertSelective(el);
+                }else {
+                    el.setUpdTime(new Date());
+                    mapper.updateByPrimaryKeySelective(el);
+                }
+            }
+        }
+      return null;
+    }
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SEOBiz.java

+package com.xxfc.platform.uccn.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.uccn.dto.SeoDTO;
+import com.xxfc.platform.uccn.entity.SEO;
+import com.xxfc.platform.uccn.mapper.SEOMapper;
+import com.xxfc.platform.uccn.vo.SEOQuery;
+import com.xxfc.platform.uccn.vo.SEOVo;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class SEOBiz extends BaseBiz<SEOMapper, SEO> {
+    public PageInfo<SeoDTO> getList(SEOQuery query) {
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        List<SeoDTO> seodtoList = mapper.getSEODTOList();
+        return PageInfo.of(seodtoList);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean update(SEOVo seoVo)  {
+
+        try {
+            if (seoVo==null) {
+
+                return false;
+            }
+            SEO seo = new SEO();
+            BeanUtilsBean.getInstance().copyProperties(seo,seoVo);
+            if (seo.getId()==null) {
+                seo.setCreTime(new Date());
+                mapper.insertSelective(seo);
+            }else {
+                seo.setUpdTime(new Date());
+                mapper.updateByPrimaryKeySelective(seo);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+    }
+
+    public SEO getSeoByModelId(Integer modelId) {
+        SEO seo = new SEO();
+        seo.setModelId(modelId);
+        return selectOne(seo);
+    }
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -212,6 +212,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         PageDataVO<SummitActivityVo> dataVO = new PageDataVO<>();
 
         Example example = new Example(SummitActivity.class);
+        example.setOrderByClause("rank ASC ,start_time DESC");
         Example.Criteria criteria = example.createCriteria();
         //未删除
         criteria.andEqualTo("isDel", 0);

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/ModelBackgroundMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.entity.Model;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface ModelBackgroundMapper extends Mapper<Model>  {
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/SEOMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.dto.SeoDTO;
+import com.xxfc.platform.uccn.entity.SEO;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface SEOMapper extends Mapper<SEO> {
+    List<SeoDTO> getSEODTOList();
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SEOController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.SEOBiz;
+import com.xxfc.platform.uccn.entity.SEO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("seo")
+@Api(tags={"seo后台管理类"})
+public class SEOController extends BaseController<SEOBiz, SEO> {
+
+
+
+    @GetMapping("officialWebsite/{modelId}")
+    @ApiOperation(value = "获取官网seo")
+    public ObjectRestResponse getSeoByModelId(@PathVariable Integer modelId){
+        return ObjectRestResponse.succ(baseBiz.getSeoByModelId(modelId));
+    }
+}
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/ModelBackgroundController.java

+package com.xxfc.platform.uccn.rest.admin;
+
+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.uccn.biz.ModelBackgroundBiz;
+import com.xxfc.platform.uccn.entity.Model;
+import com.xxfc.platform.uccn.vo.ModelVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("Model")
+@Api(tags={"Model后台管理类"})
+public class ModelBackgroundController extends BaseController<ModelBackgroundBiz, Model> {
+
+    @GetMapping("/list")
+    @ApiOperation(value = "查询模块列表")
+    public ObjectRestResponse findList(){
+       return ObjectRestResponse.succ(baseBiz.getList());
+    }
+
+    @PutMapping("/upd")
+    @ApiOperation(value = "修改模块")
+    public ObjectRestResponse update(@RequestBody ModelVo modelvo){
+        String update = baseBiz.update(modelvo);
+        if (update==null) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,update) ;
+    }
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SEOBackgroundController.java

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.SEOBiz;
+import com.xxfc.platform.uccn.entity.SEO;
+import com.xxfc.platform.uccn.vo.SEOQuery;
+import com.xxfc.platform.uccn.vo.SEOVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("seoBackground")
+@Api(tags={"seo后台管理类"})
+public class SEOBackgroundController extends BaseController<SEOBiz, SEO> {
+
+    @PostMapping("/list")
+    @ApiOperation(value = "查询模块列表")
+    public ObjectRestResponse findList(@RequestBody SEOQuery query){
+       return ObjectRestResponse.succ(baseBiz.getList(query));
+    }
+
+    @PutMapping("/upd")
+    @ApiOperation(value = "修改模块")
+    public ObjectRestResponse update(@RequestBody  SEOVo seoVo){
+        boolean result = baseBiz.update(seoVo);
+        if (result) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail() ;
+    }
+
+
+}

xx-uccn/xx-uccn-server/src/main/resources/mapper/SEOMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.uccn.mapper.SEOMapper">
+
+    <select id="getSEODTOList" resultType="com.xxfc.platform.uccn.dto.SeoDTO">
+     select
+     m.name as modelName ,
+     m.id as model_id,
+     s.title as title,
+     s.keywords as keywords,
+     s.description as description,
+     s.header as header
+     from
+     model m
+     left join
+     seo s
+     on
+     m.id= s.model_id
+     WHERE
+     m.is_del = 0
+     ORDER BY
+     m.`level` ASC
+    </select>
+
+
+</mapper>
\ No newline at end of file

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

@@ -58,8 +58,8 @@ public class VehicleActiveService {
      *
      * @param departureVo
      */
-    @Transactional
     public void departure(VehicleDepartureVo departureVo) {
+        try {
             Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
             if (vehicle == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -147,6 +147,10 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
@@ -187,8 +191,8 @@ public class VehicleActiveService {
         return stringBuilder.toString();
     }
 
-    @Transactional
     public void arrival(VehicleArrivalVo arrivalVo) {
+        try {
             Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());
             if (vehicle == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -315,6 +319,9 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态