增加注解,删除单表操作方法

diagbotman-service/src/main/java/com/diagbot/enums/ServiceTypeEnum.java

@@ -0,0 +1,49 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:服务端类型
+ * @author: zhaops
+ * @time: 2018/9/25 18:00
+ */
+public enum ServiceTypeEnum implements KeyedNamed {
+    User_Create(1, "用户建立"),
+    Sys_Create(2, "系统生成");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ServiceTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ServiceTypeEnum getEnum(Integer key) {
+        for (ServiceTypeEnum item : ServiceTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ServiceTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

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

@@ -1,8 +1,10 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.enums.ServiceTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ServiceInfoServiceImpl;
@@ -21,9 +23,10 @@ import java.util.List;
 @Component
 public class ServiceInfoFacade extends ServiceInfoServiceImpl {
     /**
-     * @Description: 新建服务端
-     * @author: zhaops
-     * @time: 2018/9/18 16:31
+     * 新建服务端
+     *
+     * @param serviceSaveVO
+     * @return
      */
     public ServiceInfo createService(ServiceSaveVO serviceSaveVO) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
@@ -39,9 +42,10 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
     }
 
     /**
-     * @Description: 修改服务端
-     * @author: zhaops
-     * @time: 2018/9/18 16:31
+     * 修改服务端
+     *
+     * @param serviceInfo
+     * @return
      */
     public Boolean updateService(ServiceInfo serviceInfo) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
@@ -56,26 +60,37 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
     }
 
     /**
-     * @Description: 获取当前登录用户服务列表
-     * @author: zhaops
-     * @time: 2018/9/18 16:31
+     * 获取当前登录用户服务列表
+     *
+     * @return
      */
     public List<ServiceInfo> getServiceListByCurrentUser() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        List<ServiceInfo> list = this.getListByUserId(userId);
+        QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
+        qw.eq("user_id", userId);
+        //服务端类型（1：用户建立，2：系统生成）
+        qw.eq("type", ServiceTypeEnum.User_Create.getKey());
+        qw.eq("is_deleted", "N");
+        List<ServiceInfo> list = this.list(qw);
         return list;
     }
 
     /**
-     * @Description: 获取当前登录用户服务分页列表
-     * @author: zhaops
-     * @time: 2018/9/19 14:05
+     * 获取当前登录用户服务分页列表
+     *
+     * @param page
+     * @return
      */
     public IPage<ServiceInfo> getServiceListPageByCurrentUser(Page<ServiceInfo> page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         ServiceInfo serviceInfoVO = new ServiceInfo();
         serviceInfoVO.setUserId(userId);
-        IPage<ServiceInfo> pagelist = this.selectServiceListPage(page, serviceInfoVO);
+        serviceInfoVO.setType(ServiceTypeEnum.User_Create.getKey());
+        QueryWrapper<ServiceInfo> qw = new QueryWrapper<>();
+        qw.eq("is_deleted", "N");
+        qw.eq("type", ServiceTypeEnum.User_Create.getKey());
+        qw.eq("user_id", userId);
+        IPage<ServiceInfo> pagelist = this.page(page, qw);
         return pagelist;
     }
 }

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

@@ -17,5 +17,11 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProductServiceMapper extends BaseMapper<ProductService> {
 
+    /**
+     * 根据用户id获取产品与服务端的关联列表（分页）
+     * @param page
+     * @param productService
+     * @return
+     */
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page page, @Param("productService") ProductServiceWrapper productService);
 }

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

@@ -1,12 +1,7 @@
 package com.diagbot.mapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.entity.ServiceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
+import com.diagbot.entity.ServiceInfo;
 
 /**
  * <p>
@@ -17,9 +12,4 @@ import java.util.List;
  * @since 2018-09-17
  */
 public interface ServiceInfoMapper extends BaseMapper<ServiceInfo> {
-    List<ServiceInfo> findByName(String name);
-
-    List<ServiceInfo> getListByUserId(Long userId);
-
-    IPage<ServiceInfo> selectServiceListPage(Page page, @Param("serviceInfo") ServiceInfo serviceInfo);
 }

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

@@ -20,5 +20,11 @@ import java.util.Map;
  */
 public interface ProductServiceService extends IService<ProductService> {
 
+    /**
+     * 根据用户id获取产品与服务端的关联列表（分页）
+     * @param page
+     * @param productService
+     * @return
+     */
     IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService);
 }

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

@@ -1,11 +1,7 @@
 package com.diagbot.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.entity.ServiceInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
+import com.diagbot.entity.ServiceInfo;
 
 /**
  * <p>
@@ -16,9 +12,4 @@ import java.util.List;
  * @since 2018-09-17
  */
 public interface ServiceInfoService extends IService<ServiceInfo> {
-    List<ServiceInfo> findByName(String name);
-
-    List<ServiceInfo> getListByUserId(Long userId);
-
-    IPage<ServiceInfo> selectServiceListPage(Page<ServiceInfo> page, ServiceInfo serviceInfo);
 }

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

@@ -20,6 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper, ProductService> implements ProductServiceService {
 
+    /**
+     * 根据用户id获取产品与服务端的关联列表（分页）
+     * @param page
+     * @param productService
+     * @return
+     */
     public IPage<ProductServiceWrapper> selectProductServiceByUserIdPage(Page<ProductServiceWrapper> page, ProductServiceWrapper productService) {
         return baseMapper.selectProductServiceByUserIdPage(page, productService);
     }

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

@@ -1,15 +1,11 @@
 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.ServiceInfo;
 import com.diagbot.mapper.ServiceInfoMapper;
 import com.diagbot.service.ServiceInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 用户服务表 服务实现类
@@ -20,15 +16,4 @@ import java.util.List;
  */
 @Service
 public class ServiceInfoServiceImpl extends ServiceImpl<ServiceInfoMapper, ServiceInfo> implements ServiceInfoService {
-    public List<ServiceInfo> findByName(String name) {
-        return baseMapper.findByName(name);
-    }
-
-    public List<ServiceInfo> getListByUserId(Long userId) {
-        return baseMapper.getListByUserId(userId);
-    }
-
-    public IPage<ServiceInfo> selectServiceListPage(Page<ServiceInfo> page, ServiceInfo serviceInfo) {
-        return baseMapper.selectServiceListPage(page, serviceInfo);
-    }
 }

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

@@ -28,6 +28,7 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <!-- 根据用户id获取产品与服务端的关联列表（分页） -->
     <select id="selectProductServiceByUserIdPage" resultMap="BaseResultWrapperMap">
         select a.* from diag_product_service a,diag_opened_products b,diag_service_info c ,diag_lantone_product d
         where a.product_id=b.product_id and a.product_id=d.id and a.service_id=c.id and a.is_deleted='N' and b.is_deleted='N' and c.is_deleted='N' and b.service_status=1  and d.is_deleted='N'

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

@@ -15,21 +15,4 @@
         <result column="user_id" property="userId" />
         <result column="type" property="type" />
     </resultMap>
-
-    <!-- 通过名称查询 -->
-    <select id="findByName" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select * from diag_service_info
-        where name = #{name} and is_deleted = 'N'
-    </select>
-
-    <!-- 通过用户id查询服务列表 -->
-    <select id="getListByUserId" resultMap="BaseResultMap" parameterType="java.lang.Long">
-        select * from diag_service_info
-        where user_id = #{userId} and is_deleted = 'N' and type=1;
-    </select>
-
-    <!-- 通过用户id查询服务分页列表 -->
-    <select id="selectServiceListPage" resultMap="BaseResultMap">
-        select * from diag_service_info where user_id=#{serviceInfo.userId} and is_deleted='N' and type=1;
-    </select>
 </mapper>