朗通后台产品线管理修改产品判断更改

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

@@ -6,6 +6,7 @@ import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
@@ -83,15 +84,12 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      */
     public Boolean deleteProduct(UpdateProductVO updateProductVO) {
         LantoneProduct lantoneProduct = getById(updateProductVO.getId());
-        //TODO 判断是否还有用户使用此产品
-        OpenedProductsIndex openedProductsIndex =new OpenedProductsIndex();
-        openedProductsIndex.setId(updateProductVO.getId());
-        openedProductsIndex.setServiceStatus(StatusEnum.Enable.getKey());
-        if(openedProductsFacade.getByProductId(openedProductsIndex).size()!=0){
-            if (!updateById(lantoneProduct)) {
+        OpenedProducts openedProducts= new OpenedProducts();
+        openedProducts.setId(updateProductVO.getId());
+        openedProducts.setServiceStatus(StatusEnum.Enable.getKey());
+        if(openedProductsFacade.getOpendById(openedProducts).size()!=0){
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "本产品还有用户使用，删除失败");
-            }
         }
         lantoneProduct.setModifier(UserUtils.getCurrentPrincipleID());
         lantoneProduct.setGmtModified(DateUtil.now());

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

@@ -90,4 +90,11 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @Date: 20:23 2018/9/20
      */
     public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex);
+
+    /**
+     * @Description: 根据产品id查询该产品是否有用户开通
+     * @Author: wangyu
+     * @Date: 20:23 2018/9/20
+     */
+    public List<OpenedProducts> getOpendById(OpenedProducts openedProducts);
 }

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

@@ -58,4 +58,11 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      */
     public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex);
 
+    /**
+     * @Description: 根据产品id查询该产品是否有用户开通
+     * @Author: wangyu
+     * @Date: 20:23 2018/9/20
+     */
+    public List<OpenedProducts> getOpendById(OpenedProducts openedProducts);
+
 }

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

@@ -76,4 +76,9 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     public List<OpendProductWrapper> getByProductId(OpenedProductsIndex openedProductsIndex) {
         return baseMapper.getByProductId(openedProductsIndex);
     }
+
+    @Override
+    public List<OpenedProducts> getOpendById(OpenedProducts openedProducts) {
+        return baseMapper.getOpendById(openedProducts);
+    }
 }

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

@@ -47,7 +47,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.addProducts(addProductsVO));
     }
 
-    @ApiOperation(value = "分页查询查询产品线[by:wangyu]",
+    @ApiOperation(value = "朗通产品线管理查询产品线[by:wangyu]",
             notes = "name：添加后则根据产品名称查询，选填<br>"+
                     "根据每页显示条数，默认 10，和当前页<br>")
     @PostMapping("/selectProduct")
@@ -83,7 +83,7 @@ public class DiagLantoneProductController {
     public RespDTO<Boolean> deleteProduct(UpdateProductVO updateProductVO){
         return RespDTO.onSuc(lantoneProductFacade.deleteProduct(updateProductVO));
     }
-    
+
     @ApiOperation(value = "查询当条产品线所有已开通用户[by:wangyu]",
             notes = "id：根据产品id查询所有已开通本产品用户，必填<br>"+
                     "current:页数<br>"+

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

@@ -177,4 +177,11 @@
         </if>
         LIMIT #{index},#{size}
     </select>
+
+	<select id="getOpendById" resultMap="BaseResultMap" parameterType="java.util.List">
+		SELECT * FROM `diag_opened_products` a where a.service_status ='1'
+		<if test="productId != null and productId != ''">
+			and a.product_id =#{productId} 
+		</if>
+	</select>
 </mapper>