Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -71,15 +72,17 @@ public class UserMemberAdminController {
 
 
     @ApiOperation("会员excel模板下载")
-    @GetMapping("/app/unauth/user/excel_model/dowload")
+    @GetMapping(value = "/app/unauth/user/excel_model/dowload",produces = "application/vnd.ms-excel")
     public ResponseEntity<byte[]> dowloadUserMemberExcelModel(HttpServletResponse response){
         // 重置response
         response.reset();
         response.setCharacterEncoding("utf-8");
-        response.setContentType("multipart/form-data");
+//        response.setContentType("application/vnd.ms-excel");
+
         response.addHeader("Content-Disposition", "attachment;filename=usermember.xlsx");
         InputStream inputStream = AdminBootstrap.class.getClassLoader().getResourceAsStream("file/usermember.xlsx");
         try {
+            response.setContentLength(inputStream.available());
             byte[] bytes = IOUtils.toByteArray(inputStream);
             return ResponseEntity.ok(bytes);
         } catch (IOException e) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -750,7 +750,7 @@ public class AppPermissionService {
     }
 
     //实名认证
-    @Transactional
+
     public ObjectRestResponse upAuthentication(Integer userid, String name, String idNumber, Integer status) {
         log.error("userid====" + userid + "-----name====" + name + "----idNumber===" + idNumber + "---status===" + status);
         if (userid == null || userid == 0 || (status == 1 && StringUtils.isBlank(idNumber) && StringUtils.isBlank(name))) {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -415,6 +415,7 @@ public class CertificationService {
                 idInformation.setUpdTime(new Date());
                 idInformationMapper.updateByPrimaryKeySelective(idInformation);
             }
+            log.info("----addIdInformation---userid==="+idInformation.getUserLonginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
             //认证成功后修改用户,用户认证状态
             ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLonginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
            return ObjectRestResponse.succ(idInformation.getId());

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

 package com.xxfc.platform.vehicle.entity;
 
+import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
 import lombok.Data;
-import tk.mybatis.mapper.annotation.KeySql;
 
 import javax.persistence.Column;
 import javax.persistence.Id;
+import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * @author libin
+ * @version 1.0
+ * @description 
+ * @data 2019/8/2 16:52
+ */
 @Data
 public class AccompanyingItem {
 
     public static final Integer NO_AMOUNT_LIMIT = -1;
 
-
     @Id
     private Integer id;
 
+    /**
+     * 物品类型，详见{@link AccompanyingItemType}
+     */
+    @Column(name = "type" )
+    private Integer type;
+
     /**
      * 物品名称
      */
@@ -23,18 +35,37 @@ public class AccompanyingItem {
     private String name;
 
     /**
-     * 物品类型，详见AccompanyingItemType
+     *标配数量
      */
-    @Column(name = "type" )
-    private Integer type;
+    @Column(name = "number")
+    private Integer number;
+
+    @Column(name = "rank")
+    private Integer rank;
 
+    /**
+     *单位
+     */
+    @Column(name = "unit")
+    private String unit;
 
+    /**
+     *价格
+     */
+    @Column(name = "price")
+    private BigDecimal price;
     /**
      * 备注
      */
+    @Column(name = "remark")
     private String remark;
 
+    @Column(name = "create_time")
     private Date createTime;
 
+    @Column(name = "update_time")
     private Date updateTime;
+
+    @Column(name = "is_del")
+    private Integer isDel;
 }

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/2 16:42
+ */
+@Data
+public class AccompanyingItemVo {
+
+    private Integer id;
+
+    /**
+     * 物品类型，详见{@link AccompanyingItemType}
+     */
+    private Integer type;
+
+    /**
+     * 物品名称
+     */
+    private String name;
+
+    /**
+     *标配数量
+     */
+    private Integer number;
+
+    /**
+     *单位
+     */
+    private String unit;
+
+    /**
+     *价格
+     */
+    private BigDecimal price;
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer rank;
+}

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

@@ -12,12 +12,18 @@ import com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper;
 import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
+import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -85,4 +91,26 @@ public class AccompanyingItemBiz extends BaseBiz<AccompanyingItemMapper, Accompa
         Integer effected = mapper.deleteByPrimaryKey(id);
         return RestResponse.suc();
     }
+
+
+    public List<AccompanyingItemVo> listAllItem(){
+
+        List<AccompanyingItemVo> accompanyingItemVos = new ArrayList<>();
+        Example example = new Example(AccompanyingItem.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        List<AccompanyingItem> accompanyingItems = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(accompanyingItems)){
+            return accompanyingItemVos;
+        }
+
+        List<AccompanyingItemVo> accompanyingItemVoList = accompanyingItems.stream().map(item -> {
+            AccompanyingItemVo accompanyingItemVo = new AccompanyingItemVo();
+            org.springframework.beans.BeanUtils.copyProperties(item, accompanyingItemVo);
+            return accompanyingItemVo;
+        }).sorted(Comparator.comparing(AccompanyingItemVo::getType).thenComparing(AccompanyingItemVo::getRank)).collect(Collectors.toList());
+
+        return accompanyingItemVoList;
+    }
+
 }

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

@@ -12,6 +12,7 @@ import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
+import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -71,4 +72,10 @@ public class AccompanyingItemController extends BaseController<AccompanyingItemB
     public RestResponse<Integer> del(@PathVariable Integer id) throws Exception{
         return baseBiz.del(id);
     }
+
+    @GetMapping("/app/unauth/items")
+    public RestResponse<List<AccompanyingItemVo>> listAccompanyingItemVo(){
+        List<AccompanyingItemVo> accompanyingItemVos = baseBiz.listAllItem();
+        return RestResponse.codeAndData(RestResponse.SUC_CODE,accompanyingItemVos);
+    }
 }