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

diagbotman-service/src/main/java/com/diagbot/entity/OpenedProductsIndex.java

@@ -40,20 +40,4 @@ public class OpenedProductsIndex implements Serializable {
      */
     private Integer orderId;
 
-    /**
-     * 每页显示条数
-     */
-    private Long size;
-
-    /**
-     * 页数
-     */
-    private Long current;
-
-    /**
-     * 入参页数
-     */
-    private Long index;
-
-
 }

diagbotman-service/src/main/java/com/diagbot/entity/ProductOrderIndex.java

@@ -31,20 +31,6 @@ public class ProductOrderIndex implements Serializable {
      */
     private Integer auditStatus;
 
-    /**
-     * 每页显示条数
-     */
-    private Long size;
-
-    /**
-     * 页数
-     */
-    private Long current;
-
-    /**
-     * 入参页数
-     */
-    private Long index;
     /**
      * 用户id
      */

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

@@ -182,19 +182,15 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @param oppendedProductVO 所需参数（产品id，页数，和每页条数，默认显示10条）
      * @return 当条产品线下所有订单信息
      */
-    public List<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO) {
-        OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
-        Long curren = oppendedProductVO.getCurrent();
-        Long size = oppendedProductVO.getSize();
-        if (curren == null || curren==0) {
-            oppendedProductVO.setCurrent(1L);
-        }
-        if (size == null || curren==0) {
-            oppendedProductVO.setSize(10L);
+    public IPage<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO) {
+        Page page =new Page();
+        if(oppendedProductVO.getCurrent() !=0 && oppendedProductVO.getSize() != 0){
+            page.setCurrent(oppendedProductVO.getCurrent());
+            page.setSize(oppendedProductVO.getSize());
         }
+        OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
         BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
-        openedProductsIndex.setIndex((oppendedProductVO.getCurrent().longValue() - 1) * oppendedProductVO.getSize().longValue());
-        List<OpendProductWrapper> list = openedProductsFacade.getByProductId(openedProductsIndex);
+        List<OpendProductWrapper> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
         List<Long> list1 = new ArrayList<>();
         for (OpendProductWrapper opendProducts : list) {
             Long longs = opendProducts.getUserId();
@@ -212,7 +208,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
                 BeanUtil.copyProperties(uo,bean);
             }
         }
-        return list;
+        return page;
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.AuthDetailDTO;
@@ -183,24 +184,20 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @param productOrderVO （订单编号，机构名称，申请状态）
 	 * @return 所有订单信息
 	 */
-	public RespDTO<Page<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
+	public RespDTO<IPage<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
+	    Page page =new Page();
+        if(productOrderVO.getCurrent() !=0 && productOrderVO.getSize() != 0){
+            page.setCurrent(productOrderVO.getCurrent());
+            page.setSize(productOrderVO.getSize());
+        }
 		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
-		Long curren = productOrderVO.getCurrent();
-		Long size =productOrderVO.getSize();
-		if(curren==null){
-			productOrderVO.setCurrent(1L);
-		}
-		if (size==null){
-			productOrderVO.setSize(10L);
-		}
 		BeanUtil.copyProperties(productOrderVO, productOrderIndex);
-		productOrderIndex.setIndex((productOrderVO.getCurrent().longValue()-1)*productOrderVO.getSize().longValue());
 		//TODO
         if(productOrderVO.getOrgName()!=null&&productOrderVO.getOrgName()!=""){
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
             productOrderIndex.setUserId(rlist.data);
         }
-		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(productOrderIndex);
+		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
 		List<Long> list1 =new ArrayList<>();
 		for (ProductOrderWrapper productOrderWrapper:list) {
 			Long longs = productOrderWrapper.getUserId();
@@ -222,11 +219,6 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 				bean.setOrgName(uo.getOrgName());
 			}
 		}
-        Page page =new Page();
-        page.setRecords(list);
-        page.setCurrent(productOrderVO.getCurrent());
-        page.setSize(productOrderVO.getSize());
-        page.setTotal(productOrderFacade.selectProductOrderCount(productOrderIndex));
 		return RespDTO.onSuc(page);
 	}
 
@@ -275,7 +267,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", productOrderExportVO.getStartTime());
         userMap.put("endTime", productOrderExportVO.getEndTime());
-        RespDTO<Page<ProductOrderWrapper>> datas = this.selectAllProductOrder(productOrderVO);
+        RespDTO<IPage<ProductOrderWrapper>> datas = this.selectAllProductOrder(productOrderVO);
         GsonUtil.toJson(datas.data.getRecords());
         List<String> listName = new ArrayList<>();
 

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

@@ -99,7 +99,7 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @Author: wangyu
      * @Date: 20:23 2018/9/20
      */
-    public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex);
+     IPage<OpendProductWrapper> getByProductId(Page page,@Param("opend") OpenedProductsIndex openedProductsIndex);
 
     /**
      * @Description: 根据产品id查询该产品是否有用户开通

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

@@ -1,10 +1,13 @@
 package com.diagbot.mapper;
 
 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.dto.AuthDetailDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,12 +62,6 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
-    public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderIndex productOrderIndex);
+    IPage<ProductOrderWrapper> selectAllProductOrder(Page page, @Param("product") ProductOrderIndex productOrderIndex);
 
-    /**
-     * @Description: 产品申请查询所有订单信息总条数接口
-     * @Author: wangyu
-     * @Date: 19:39 2018/9/20
-     */
-    public int selectProductOrderCount(ProductOrderIndex productOrderIndex);
 }

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

@@ -62,7 +62,7 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @param openedProductsIndex
      * @return
      */
-    public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex);
+        IPage<OpendProductWrapper> getByProductId(Page page,OpenedProductsIndex openedProductsIndex);
 
     /**
      * 根据产品id查询该产品是否有用户开通

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

@@ -1,12 +1,12 @@
 package com.diagbot.service;
 
+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.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 
-import java.util.List;
-
 /**
  * <p>
  * 订单表 服务类
@@ -29,12 +29,6 @@ public interface ProductOrderService extends IService<ProductOrder> {
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
-    public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderIndex productOrderIndex);
+    IPage<ProductOrderWrapper> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex);
 
-    /**
-     * @Description: 产品申请查询所有订单信息总条数接口
-     * @Author: wangyu
-     * @Date: 19:39 2018/9/20
-     */
-    public int selectProductOrderCount(ProductOrderIndex productOrderIndex);
 }

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

@@ -74,8 +74,8 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     }
 
     @Override
-    public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex) {
-        return baseMapper.getByProductId(openedProductsIndex);
+    public IPage<OpendProductWrapper> getByProductId(Page page,OpenedProductsIndex openedProductsIndex) {
+        return baseMapper.getByProductId(page,openedProductsIndex);
     }
 
     @Override

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

@@ -1,15 +1,15 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.mapper.ProductOrderMapper;
 import com.diagbot.service.ProductOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 订单表 服务实现类
@@ -27,12 +27,8 @@ public class ProductOrderServiceImpl extends ServiceImpl<ProductOrderMapper, Pro
     }
 
     @Override
-    public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderIndex productOrderIndex) {
-        return baseMapper.selectAllProductOrder(productOrderIndex);
+    public IPage<ProductOrderWrapper> selectAllProductOrder(Page page,ProductOrderIndex productOrderIndex) {
+        return baseMapper.selectAllProductOrder(page,productOrderIndex);
     }
 
-    @Override
-    public int selectProductOrderCount(ProductOrderIndex productOrderIndex) {
-        return baseMapper.selectProductOrderCount(productOrderIndex);
-    }
 }

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

@@ -100,8 +100,7 @@ public class DiagLantoneProductController {
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")
-    public RespDTO<List<OpendProductWrapper>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
-
+    public RespDTO<IPage<OpendProductWrapper>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }
 

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

@@ -1,6 +1,6 @@
 package com.diagbot.web;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
@@ -134,7 +134,7 @@ public class ProductOrderController {
     @ApiOperation(value = "产品申请——显示所有订单[by:wangyu]",
             notes = "current:页数<br>" +
                     "size:每页显示条数<br>" +
-                    "auditStatus:审核状态（0.未付款1.已付款）<br>" +
+                    "auditStatus:审核状态（0.不通过1.通过2.待审核3.部分通过4.部分审核）<br>" +
                     "num:订单编号<br>" +
                     "orgName:机构名称<br>" +
                     "id:订单id<br>" +
@@ -144,7 +144,7 @@ public class ProductOrderController {
                     "username:手机号码<br>")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
-    public RespDTO<Page<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
+    public RespDTO<IPage<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
         return productOrderFacade.selectAllProductOrder(productOrderVO);
     }
 

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

@@ -206,11 +206,11 @@
             resultMap="BaseResultWrapper">
         SELECT a.*,b.time order_time from diag_opened_products a
         LEFT JOIN diag_product_order b ON a.order_id =b.id
-        WHERE product_id =#{productId} AND a.is_deleted='N'
-        <if test="serviceStatus != null and serviceStatus != ''">
-            and t.service_status=#{serviceStatus}
+        WHERE product_id =#{opend.productId} AND a.is_deleted='N'
+        <if test="opend.serviceStatus != null and opend.serviceStatus != ''">
+            and t.service_status=#{opend.serviceStatus}
         </if>
-        LIMIT #{index},#{size}
+        ORDER BY b.time desc
     </select>
 
     <select id="getOpendById" resultMap="BaseResultMap" parameterType="java.util.List">

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

@@ -79,39 +79,20 @@
 		where b.audit_status=2
     </select>
 
-    <select id="selectAllProductOrder" resultMap="BaseResultWrapper"
-            parameterType="com.diagbot.entity.ProductOrderIndex">
+    <select id="selectAllProductOrder" resultMap="BaseResultWrapper">
         SELECT id , `num` , `user_id` , `time` , `audit_status` FROM diag_product_order WHERE is_deleted='N'
-        <if test="num != null and num != ''">
-            AND num like concat ('%',#{num},'%')
-        </if>
-        <if test="auditStatus != null and auditStatus != ''">
-            AND audit_status=#{auditStatus}
-        </if>
-        <if test="userId != null and userId.size > 0">
-            AND user_id IN
-            <foreach item="userId" collection="userId" open="(" separator="," close=")">
-                #{userId}
-            </foreach>
-        </if>
-        <if test=" size != null and size != ''">
-            LIMIT #{index},#{size}
-        </if>
-    </select>
-
-    <select id="selectProductOrderCount" parameterType="com.diagbot.entity.ProductOrderIndex" resultType="java.lang.Integer">
-        SELECT COUNT(1) FROM diag_product_order WHERE is_deleted='N'
-        <if test="num != null and num != ''">
-            AND num like concat ('%',#{num},'%')
+        <if test="product.num != null and product.num != ''">
+            AND num like concat ('%',#{product.num},'%')
         </if>
-        <if test="auditStatus != null and auditStatus != ''">
-            AND audit_status=#{auditStatus}
+        <if test="product.auditStatus != null and product.auditStatus != ''">
+            AND audit_status=#{product.auditStatus}
         </if>
-        <if test="userId != null and userId.size > 0">
+        <if test="product.userId != null and product.userId.size > 0">
             AND user_id IN
-            <foreach item="userId" collection="userId" open="(" separator="," close=")">
-                #{userId}
+            <foreach item="product.userId" collection="product.userId" open="(" separator="," close=")">
+                #{product.userId}
             </foreach>
         </if>
+        ORDER BY time DESC
     </select>
 </mapper>

user-service/src/main/java/com/diagbot/vo/ModifyPasswordVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 修改密码参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class ModifyPasswordVO {
+    private String password; //原密码
+    private String modifyPassword; //新密码
+}

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -15,6 +15,7 @@ import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.AppkeySecretVO;
 import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.JwtVO;
+import com.diagbot.vo.ModifyPasswordVO;
 import com.diagbot.vo.PersonVO;
 import com.diagbot.vo.ResetPasswordVO;
 import com.diagbot.vo.UserInfoByIdPageVO;
@@ -141,13 +142,14 @@ public class UserController {
 
 
     @ApiOperation(value = "修改密码[by:zhoutg]",
-            notes = "username：用户名,必填<br>" +
-                    "password：密码, 必填<br> ")
+            notes = "password：原密码,必填<br>" +
+                    "modifyPassword：新密码, 必填<br> ")
     @PostMapping("/midifyPassword")
     @SysLogger("midifyPassword")
     @Transactional
-    public RespDTO<Boolean> midifyPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
-        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "Y");
+    public RespDTO<Boolean> midifyPassword(@RequestBody ModifyPasswordVO modifyPasswordVO) {
+        Boolean flag = userFacade.modifyPassword(modifyPasswordVO.getPassword(), modifyPasswordVO.getModifyPassword());
+        return RespDTO.onSuc(flag);
     }