Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/config/IdcConfigurer.java

@@ -0,0 +1,25 @@
+package com.diagbot.config;
+
+//import com.diagbot.idc.InvisibleIdCreater;
+import com.diagbot.idc.VisibleIdCreater;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: ID生成器配置
+ * @author: gaodm
+ * @time: 2018/9/20 10:43
+ */
+@Configuration
+public class IdcConfigurer {
+
+    @Bean
+    public VisibleIdCreater visibleIdCreater() {
+        return new VisibleIdCreater(0, 0);
+    }
+
+//    @Bean
+//    public InvisibleIdCreater invisibleIdCreater() {
+//        return new InvisibleIdCreater(0, 0);
+//    }
+}

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -1,8 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
+import com.diagbot.util.UserUtils;
 import org.springframework.stereotype.Component;
 
 /**
@@ -62,4 +65,15 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }
         return CommonErrorCode.OK;
     }
+
+    /**
+     * @Description: 根据用户id查询是否有开通产品
+     * @Author: wangyu
+     * @Date: 19:59 2018/9/18
+     */
+    public IPage<LantoneProduct> productLine(Page page){
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        IPage<LantoneProduct> diagLantoneProducts =productLine(page,userId);
+        return diagLantoneProducts;
+    }
 }

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -0,0 +1,20 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.entity.OrderDetails;
+import com.diagbot.service.impl.OrderDetailsServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/19 20:22
+ */
+@Component
+public class OrderDetailsFacade extends OrderDetailsServiceImpl{
+    public IPage<OrderDetails> orderDetialShows(Page page,OrderDetails orderDetails){
+        IPage<OrderDetails> orderDetailsIPage =this.orderDetialShow(page,orderDetails);
+        return orderDetailsIPage;
+    }
+}

diagbotman-service/src/main/java/com/diagbot/facade/ProductServiceFacade.java

@@ -138,7 +138,7 @@ public class ProductServiceFacade extends ProductServiceServiceImpl {
         //删除关联令牌
         serviceTokenFacade.deleteByProductServiceId(productService.getId());
         //删除产品服务端
-        this.deleteById(productService.getId());
+        this.delById(productService.getId());
         productServiceRespDTO.setMsg("删除成功！");
         return productServiceRespDTO;
     }

diagbotman-service/src/main/java/com/diagbot/idc/AbstractIdCreater.java

@@ -0,0 +1,36 @@
+package com.diagbot.idc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: ID生成抽象类接口
+ * @author: gaodm
+ * @time: 2018/9/5 9:20
+ */
+public abstract class AbstractIdCreater<T> implements IdCreater<T> {
+
+    protected int machineId;
+    protected int dataCenterId;
+
+    public AbstractIdCreater(int machineId, int dataCenterId) {
+        this.machineId = machineId;
+        this.dataCenterId = dataCenterId;
+    }
+
+    @Override
+    public abstract Long getNextId(T param);
+
+    @Override
+    public List<Long> getNextIds(T param, int size) {
+        List<Long> longs = new ArrayList<>(size);
+        for (int i = 0; i < size; i++) {
+            longs.add(getNextId(param));
+        }
+        return longs;
+    }
+
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+}

diagbotman-service/src/main/java/com/diagbot/idc/IdCreater.java

@@ -0,0 +1,24 @@
+package com.diagbot.idc;
+
+import java.util.List;
+
+/**
+ * @Description: ID生成接口
+ * @author: gaodm
+ * @time: 2018/9/5 9:21
+ */
+public interface IdCreater<T> {
+
+    /**
+     * 生成一个id
+     * @return 生成的id
+     */
+    Long getNextId(T param);
+
+    /**
+     * 批量生成id
+     * @param size 生成数量
+     * @return 生成的id列表
+     */
+    List<Long> getNextIds(T param, int size);
+}

diagbotman-service/src/main/java/com/diagbot/idc/InvisibleIdCreater.java

@@ -0,0 +1,62 @@
+//package com.diagbot.idc;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.dao.DataAccessException;
+//import org.springframework.data.redis.connection.RedisConnection;
+//import org.springframework.data.redis.core.RedisCallback;
+//import org.springframework.data.redis.core.RedisTemplate;
+//
+//import java.util.List;
+//
+///**
+// * @Description: 不可见id由redis生成
+// * @author: gaodm
+// * @time: 2018/9/5 9:21
+// */
+//@SuppressWarnings("unchecked")
+//@Slf4j
+//public class InvisibleIdCreater extends AbstractIdCreater<Class> {
+//
+//    @Autowired
+//    @Qualifier("redisTemplateForIdc")
+//    RedisTemplate redisTemplate;
+//
+//    public InvisibleIdCreater(int machineId, int dataCenterId) {
+//        super(machineId, dataCenterId);
+//    }
+//
+//    @Override
+//    public Long getNextId(Class param) {
+//        final byte[] redis_key = redisTemplate.getKeySerializer().serialize("id_" + param.getName());
+//        Object execute = redisTemplate.execute(new RedisCallback() {
+//            @Override
+//            public Long doInRedis(RedisConnection connection) throws DataAccessException {
+//                Long incr = connection.incr(redis_key);
+//                return incr;
+//            }
+//        });
+//        return (Long) execute;
+//    }
+//
+//    @Override
+//    public List<Long> getNextIds(Class param, final int size) {
+//        final byte[] rawKey = redisTemplate.getKeySerializer().serialize("id_" + param.getName());
+//        //pipeline
+//        RedisCallback<List<Object>> pipelineCallback = new RedisCallback<List<Object>>() {
+//            @Override
+//            public List<Object> doInRedis(RedisConnection connection) throws DataAccessException {
+//                connection.openPipeline();
+//                for (int i = 0; i < size; i++) {
+//                    connection.incr(rawKey);
+//                }
+//                return connection.closePipeline();
+//            }
+//        };
+//
+//        List<Long> results = (List<Long>) redisTemplate.execute(pipelineCallback);
+//        return results;
+//    }
+//
+//}

diagbotman-service/src/main/java/com/diagbot/idc/VisibleIdCreater.java

@@ -0,0 +1,71 @@
+package com.diagbot.idc;
+
+
+import com.diagbot.util.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.util.Calendar;
+
+/**
+ * @Description: 可见id每秒递增
+ * @author: gaodm
+ * @time: 2018/9/5 10:45
+ */
+@Slf4j
+public class VisibleIdCreater extends AbstractIdCreater<Integer> {
+
+    private long lastTimestamp = -1L;
+
+    private long sequence = 0L;
+    private long sequenceMask = 9999;
+
+    public VisibleIdCreater(int machineId, int dataCenterId) {
+        super(machineId, dataCenterId);
+    }
+
+    @Override
+    /**
+     *  对外id生成规则
+     *  180905123451110001
+     *  180905 - 12345 -  1   -  1   -     1     - 0001
+     *   日期 -  秒数  - 业务 - 机器 - 数据中心 - 秒内自增
+     *  @param type 业务id 1.订单 2.交易 3.退款
+     *  @return 生成的id
+     */
+    public synchronized Long getNextId(Integer type) {
+
+        Calendar calendar = Calendar.getInstance();
+
+        long timestamp = timeGen() / 1000;
+
+        if (timestamp < lastTimestamp) {
+            log.error(String.format("clock is moving backwards. Rejecting requests until %d.", lastTimestamp));
+            throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1);
+            if (sequence > sequenceMask) {
+                //timestamp = tilNextMillis(lastTimestamp);
+                log.error(String.format("id creater sequence is full. wait to next time"));
+                return null;
+            }
+        } else {
+            sequence = getNewSequence();
+        }
+
+        lastTimestamp = timestamp;
+
+        String date = DateUtil.format(calendar.getTime(), "yyMMdd");
+        long seconds = DateUtils.getFragmentInSeconds(calendar, Calendar.DAY_OF_YEAR);
+
+        return Long.valueOf(date + String.format("%05d", seconds) + String.valueOf(type) + machineId + dataCenterId + sequence);
+    }
+
+    private long getNewSequence() {
+        return RandomUtils.nextInt(1000, 2000);
+    }
+
+}

diagbotman-service/src/main/java/com/diagbot/mapper/LantoneProductMapper.java

@@ -22,7 +22,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> productLine(Page page, @Param("userId") int userId);
+    IPage<LantoneProduct> productLine(Page page, @Param("userId") Long userId);
 
     /**
      * @Description: 用户查询所有未开通产品

diagbotman-service/src/main/java/com/diagbot/mapper/OrderDetailsMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.OrderDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.entity.OrderDetails;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
 
+    /**
+     * @Description: 订单编号查询订单明细
+     * @Author: wangyu
+     * @Date: 20:17 2018/9/19
+     */
+    IPage<OrderDetails>  orderDetialShow(Page page, @Param("orderDetails") OrderDetails orderDetails);
 }

diagbotman-service/src/main/java/com/diagbot/mapper/ProductServiceMapper.java

@@ -27,5 +27,5 @@ public interface ProductServiceMapper extends BaseMapper<ProductService> {
 
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page page, @Param("productService") ProductServiceWrapper productService);
 
-    Integer deleteById(Long id);
+    Integer delById(Long id);
 }

diagbotman-service/src/main/java/com/diagbot/service/LantoneProductService.java

@@ -21,7 +21,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    IPage<LantoneProduct> productLine(Page<LantoneProduct> page, int userId);
+     IPage<LantoneProduct> productLine(Page<LantoneProduct> page,Long userId);
 
     /**
      * @Description: 朗通查询所有产品线

diagbotman-service/src/main/java/com/diagbot/service/OrderDetailsService.java

@@ -1,7 +1,9 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.OrderDetails;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.OrderDetails;
 
 /**
  * <p>
@@ -13,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface OrderDetailsService extends IService<OrderDetails> {
 
+    /**
+     * @Description: 订单编号查询订单明细
+     * @Author: wangyu
+     * @Date: 20:17 2018/9/19
+     */
+    IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails);
 }

diagbotman-service/src/main/java/com/diagbot/service/ProductServiceService.java

@@ -25,5 +25,5 @@ public interface ProductServiceService extends IService<ProductService> {
 
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService);
 
-    Integer deleteById(Long id);
+    Integer delById(Long id);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/LantoneProductServiceImpl.java

@@ -26,8 +26,8 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
      * @Date: 13:29 2018/9/18
      */
     @Override
-    public IPage<LantoneProduct> productLine(Page<LantoneProduct> page,int userId) {
-        return baseMapper.productLine(page,userId);
+    public IPage<LantoneProduct> productLine(Page<LantoneProduct> page,Long userId) {
+        return baseMapper.productLine(page, userId);
     }
 
     /**

diagbotman-service/src/main/java/com/diagbot/service/impl/OrderDetailsServiceImpl.java

@@ -1,5 +1,7 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.mapper.OrderDetailsMapper;
 import com.diagbot.service.OrderDetailsService;
@@ -17,4 +19,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, OrderDetails> implements OrderDetailsService {
 
+    /**
+     * @Description: 订单编号查询订单明细
+     * @Author: wangyu
+     * @Date: 20:17 2018/9/19
+     */
+    @Override
+    public IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails){
+        return null;
+    }
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/ProductServiceServiceImpl.java

@@ -35,7 +35,7 @@ public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper,
         return baseMapper.selectProductServiceByUserIdPage(page, productService);
     }
 
-    public Integer deleteById(Long id) {
-        return baseMapper.deleteById(id);
+    public Integer delById(Long id) {
+        return baseMapper.delById(id);
     }
 }

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -7,6 +7,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.facade.LantoneProductFacade;
+import com.diagbot.facade.OpenedProductsFacade;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +29,8 @@ import java.util.Map;
 public class DiagLantoneProductController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
+    @Autowired
+    private OpenedProductsFacade openedProductsFacade;
 
     @ApiOperation(value = "添加产品线",
             notes = "name：产品名，必填<br>" +
@@ -51,7 +54,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(pages);
     }
 
-    @ApiOperation(value = "修改产品",
+    @ApiOperation(value = "修改产品(产品启用同接口)",
             notes = "id：根据产品id修改产品内容，必填<br>")
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
@@ -86,5 +89,7 @@ public class DiagLantoneProductController {
         System.out.println(lantoneProductFacade.opendedProduct(page,map));
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(page,map));
     }
+
+
 }
 

diagbotman-service/src/main/java/com/diagbot/web/DiagOrderDetailsController.java

@@ -0,0 +1,35 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.OrderDetails;
+import com.diagbot.facade.OrderDetailsFacade;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: 订单明细 前端控制器
+ * @Author: wangyu
+ * @Date: 15:46 2018/9/17
+ */
+@RestController
+@RequestMapping("/diagOrderDetails")
+public class DiagOrderDetailsController {
+    @Autowired
+    private OrderDetailsFacade orderDetailsFacade;
+
+    @ApiOperation(value = "根据订单编号查询订单明细", notes = "orderNum订单编号  必填<br>")
+    @GetMapping("/orderDetialShow")
+    @SysLogger("orderDetialShow")
+    public RespDTO<OrderDetails> orderDetialShow(Page page,OrderDetails orderDetails){
+        IPage<OrderDetails> orderDetailsIPage = orderDetailsFacade.orderDetialShows(page,orderDetails);
+        return RespDTO.onSuc(orderDetailsIPage);
+    }
+}
+

diagbotman-service/src/main/java/com/diagbot/web/MoreServiceController.java

@@ -29,9 +29,7 @@ public class MoreServiceController {
     @GetMapping("/showProductInfo")
     @SysLogger("showProductInfo")
     public RespDTO<LantoneProduct> showProductInfo(Page page){
-
-        /*int userId = Integer.parseInt(UserUtils.getCurrentPrincipleID());//获取用户id*/
-        IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page,1);
+        IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page);
         return RespDTO.onSuc(diagLantoneProducts);
     }
 }

diagbotman-service/src/main/resources/mapper/OrderDetailsMapper.xml

@@ -19,5 +19,7 @@
         <result column="reject_type" property="rejectType" />
         <result column="reject_reason" property="rejectReason" />
     </resultMap>
-
+    <select id="orderDetialShow" resultMap="BaseResultMap">
+        SELECT * FROM diag_order_details WHERE order_num =#{orderDetails.orderNum}
+    </select>
 </mapper>

diagbotman-service/src/main/resources/mapper/ProductServiceMapper.xml

@@ -44,7 +44,7 @@
         and b.user_id=#{productService.userId} and c.user_id=#{productService.userId} and (find_in_set('1',d.access_type) or FIND_IN_SET('2',d.access_type))
     </select>
 
-    <update id="deleteById" parameterType="java.lang.Long">
+    <update id="delById" parameterType="java.lang.Long">
         update diag_product_service set is_deleted='Y'
         where id = #{id} and is_deleted = 'N'
     </update>

user-service/src/main/java/com/diagbot/config/IdcConfigurer.java

@@ -0,0 +1,25 @@
+package com.diagbot.config;
+
+import com.diagbot.idc.InvisibleIdCreater;
+import com.diagbot.idc.VisibleIdCreater;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: ID生成器配置
+ * @author: gaodm
+ * @time: 2018/9/20 10:43
+ */
+@Configuration
+public class IdcConfigurer {
+
+    @Bean
+    public VisibleIdCreater visibleIdCreater() {
+        return new VisibleIdCreater(0, 0);
+    }
+
+    @Bean
+    public InvisibleIdCreater invisibleIdCreater() {
+        return new InvisibleIdCreater(0, 0);
+    }
+}

user-service/src/main/java/com/diagbot/facade/VerFacade.java

@@ -36,6 +36,8 @@ public class VerFacade {
     private SmsVerService smsVerService;
     @Autowired
     private UserFacade userFacade;
+    @Autowired
+    private VisibleIdCreater visibleIdCreater;
 
     /**
      * 获取用户图片验证信息
@@ -43,7 +45,6 @@ public class VerFacade {
      */
     public ImgVerCreatDTO getImgVerification(){
         ImgVerCreatDTO imgVerCreatDTO = new ImgVerCreatDTO();
-        VisibleIdCreater visibleIdCreater = new VisibleIdCreater(1,1);
         String imgId = visibleIdCreater.getNextId(VisibleIdTypeEnum.IS_IMG_VER.getKey()).toString();
         ImgVerInfo imgVerInfo = new ImgVerInfo();
         imgVerInfo.setImgId(imgId);