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

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

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.SysLogServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 用户日志业务层
- * @author: gaodm
- * @time: 2018/8/6 9:11
- */
-@Component
-public class SysLogFacade extends SysLogServiceImpl {
-}

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

@@ -3,6 +3,9 @@ package com.diagbot.mapper;
 import com.diagbot.entity.ProductService;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 服务端维护表 Mapper 接口
@@ -13,4 +16,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProductServiceMapper extends BaseMapper<ProductService> {
 
+    ProductService findByProductIdAndServiceId(Map<String, Object> map);
+
+    List<ProductService> findByProductId(Long productId);
+
 }

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

@@ -3,6 +3,8 @@ package com.diagbot.mapper;
 import com.diagbot.entity.ServiceInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户服务表 Mapper 接口
@@ -12,5 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-09-17
  */
 public interface ServiceInfoMapper extends BaseMapper<ServiceInfo> {
+    ServiceInfo findByName(String name);
 
+    List<ServiceInfo> getListByUserId(Long userId);
 }

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

@@ -17,4 +17,12 @@ public interface ServiceTokenMapper extends BaseMapper<ServiceToken> {
 
 
     public ServiceToken getServiceToken(Map map);
+
+    ServiceToken getByProductServiceId(Long productServiceId);
+
+    ServiceToken deleteByProductServiceId(Long productServiceId);
+
+    ServiceToken enableToken(Long productServiceId);
+
+    ServiceToken disableToken(Long productServiceId);
 }

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

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.SysLog;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysLogMapper extends BaseMapper<SysLog> {
-
-}

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

@@ -3,6 +3,9 @@ package com.diagbot.service;
 import com.diagbot.entity.ProductService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 服务端维护表 服务类
@@ -12,5 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-09-17
  */
 public interface ProductServiceService extends IService<ProductService> {
+    ProductService findByProductIdAndServiceId(Map<String, Object> map);
 
+    List<ProductService> findByProductId(Long productId);
 }

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

@@ -3,6 +3,8 @@ package com.diagbot.service;
 import com.diagbot.entity.ServiceInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户服务表 服务类
@@ -12,5 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-09-17
  */
 public interface ServiceInfoService extends IService<ServiceInfo> {
-
+    ServiceInfo findByName(String name);
+    List<ServiceInfo> getListByUserId(Long userId);
 }

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

@@ -19,4 +19,12 @@ public interface ServiceTokenService extends IService<ServiceToken> {
      * @Date: 2018/9/18 16:38
      */
     public ServiceToken getServiceToken(String appkey, String secret);
+
+    ServiceToken getByProductServiceId(Long productServiceId);
+
+    ServiceToken deleteByProductServiceId(Long productServiceId);
+
+    ServiceToken enableToken(Long productServiceId);
+
+    ServiceToken disableToken(Long productServiceId);
 }

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

@@ -1,15 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.SysLog;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysLogService extends IService<SysLog> {
-}

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

@@ -6,6 +6,9 @@ import com.diagbot.service.ProductServiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 服务端维护表 服务实现类
@@ -16,5 +19,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ProductServiceServiceImpl extends ServiceImpl<ProductServiceMapper, ProductService> implements ProductServiceService {
+    public ProductService findByProductIdAndServiceId(Map<String, Object> map) {
+        return baseMapper.findByProductIdAndServiceId(map);
+    }
 
+    public List<ProductService> findByProductId(Long productId) {
+        return baseMapper.findByProductId(productId);
+    }
 }

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

@@ -6,6 +6,8 @@ import com.diagbot.service.ServiceInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户服务表 服务实现类
@@ -16,5 +18,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ServiceInfoServiceImpl extends ServiceImpl<ServiceInfoMapper, ServiceInfo> implements ServiceInfoService {
+    public ServiceInfo findByName(String name){
+        return baseMapper.findByName(name);
+    }
+
+    public List<ServiceInfo> getListByUserId(Long userId){
+        return baseMapper.getListByUserId(userId);
+    }
 
 }

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

@@ -31,4 +31,20 @@ public class ServiceTokenServiceImpl extends ServiceImpl<ServiceTokenMapper, Ser
         paramMap.put("secret", secret);
         return serviceTokenMapper.getServiceToken(paramMap);
     }
+
+    public ServiceToken getByProductServiceId(Long productServiceId){
+        return  baseMapper.getByProductServiceId(productServiceId);
+    }
+
+    public ServiceToken deleteByProductServiceId(Long productServiceId){
+        return baseMapper.deleteByProductServiceId(productServiceId);
+    }
+
+    public ServiceToken enableToken(Long productServiceId){
+        return baseMapper.enableToken(productServiceId);
+    }
+
+    public ServiceToken disableToken(Long productServiceId){
+        return baseMapper.disableToken(productServiceId);
+    }
 }

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

@@ -1,19 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.SysLog;
-import com.diagbot.mapper.SysLogMapper;
-import com.diagbot.service.SysLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-@Service
-public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements SysLogService {
-}

diagbotman-service/src/main/java/com/diagbot/vo/SysLogVo.java

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/8/6 10:16
- */
-@Getter
-@Setter
-public class SysLogVo {
-    private Date createDate;
-    private String ip;
-    private String method;
-    private String operation;
-    private String params;
-}

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

@@ -1,108 +0,0 @@
-package com.diagbot.web;
-
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-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.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.SysLog;
-import com.diagbot.facade.SysLogFacade;
-import com.diagbot.vo.SysLogVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.Date;
-
-/**
- * @Description: 日志操作控制层
- * @author: gaodm
- * @time: 2018/8/30 10:12
- */
-@RestController
-@ApiIgnore
-@RequestMapping("/log")
-public class SysLogController {
-
-    @Autowired
-    private SysLogFacade sysLogFacade;
-
-    /**
-     * 新增日志信息
-     *
-     * @param sysLogVo 新增日志输入参数
-     * @return 新增日志是否成功
-     */
-    @ApiOperation(value = "添加日志", notes = "添加日志")
-    @PostMapping("/add")
-    @SysLogger("postLog")
-    public RespDTO add(@RequestBody SysLogVo sysLogVo){
-        //初始化新增日志信息
-        SysLog sysLog = new SysLog();
-        sysLog.setGmtCreate(new Date());
-        sysLog.setIp(sysLogVo.getIp());
-        sysLog.setMethod(sysLogVo.getMethod());
-        sysLog.setOperation(sysLogVo.getOperation());
-        sysLog.setParams(sysLogVo.getParams());
-        return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
-    }
-
-    /**
-     * 删除日志
-     * @param id 日志信息ID
-     * @return 删除是否成功
-     */
-    @ApiOperation(value = "删除日志", notes = "删除日志")
-    @DeleteMapping("/delete/{id}")
-    @SysLogger("deleteLog")
-    public RespDTO delete(@PathVariable(value = "id") Integer id){
-        return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
-    }
-
-    /**
-     * 修改日志
-     * @param sysLog 修改日志输入参数
-     * @return 修改是否成功
-     */
-    @ApiOperation(value = "修改日志", notes = "修改日志")
-    @PostMapping("/update")
-    @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog sysLog){
-        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
-    }
-
-    /**
-     * 获取日志列表
-     * @return 日志列信息
-     */
-    @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
-    @GetMapping("/list")
-    @SysLogger("listLog")
-    public RespDTO list(){
-        Wrapper<SysLog> wrapper = new QueryWrapper<>();
-        return RespDTO.onSuc(sysLogFacade.list(wrapper));
-    }
-
-    /**
-     * 获取日志翻页信息
-     * @return 日志翻页信息
-     */
-    @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
-    @GetMapping("/page")
-    @SysLogger("pageLog")
-    public RespDTO page() {
-        //初始化日志翻页参数
-        IPage<SysLog> wrapper = new Page<>();
-        return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
-    }
-}
-

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

@@ -15,4 +15,14 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="findByProductIdAndServiceId" resultMap="BaseResultMap" parameterType="java.util.Map">
+        select * from diag_product_service
+        where product_id = #{procuctId} and service_id=#{serviceId} and is_deleted = 'N'
+    </select>
+
+    <select id="findByProductId" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select * from diag_product_service
+        where product_id = #{procuctId} and is_deleted = 'N'
+    </select>
+
 </mapper>

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

@@ -15,4 +15,13 @@
         <result column="user_id" property="userId" />
     </resultMap>
 
+    <select id="findByName" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select * from diag_service_info
+        where name = #{name} and is_deleted = 'N'
+    </select>
+
+    <select id="getListByUserId" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select * from diag_service_info
+        where user_id = #{userId} and is_deleted = 'N'
+    </select>
 </mapper>

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

@@ -25,4 +25,24 @@
         SELECT a.* FROM `diag_service_token` a  and a.is_deleted = 'N' and a.app_key_id = #{appkey} and a.app_key_secret = #{secret}
     </select>
 
+    <select id="getByProductServiceId" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select * from diag_service_token
+        where product_sevice_id = #{productServiceId} and is_deleted = 'N'
+    </select>
+
+    <select id="deleteByProductServiceId" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        update diag_service_token set is_deleted='Y'
+        where product_sevice_id = #{productServiceId} and is_deleted = 'N'
+    </select>
+
+    <select id="enableToken" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        update diag_service_token set status=1
+        where product_sevice_id = #{productServiceId} and is_deleted = 'N'
+    </select>
+
+    <select id="disableToken" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        update diag_service_token set status=0
+        where product_sevice_id = #{productServiceId} and is_deleted = 'N'
+    </select>
+
 </mapper>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.SysLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="ip" property="ip" />
-        <result column="sys_type" property="sysType" />
-        <result column="method" property="method" />
-        <result column="operation" property="operation" />
-        <result column="params" property="params" />
-        <result column="username" property="username" />
-    </resultMap>
-
-</mapper>

pom.xml

@@ -37,7 +37,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.SR1</spring-cloud.version>
-        <mybatis-plus-boot-starter.version>3.0.2</mybatis-plus-boot-starter.version>
+        <mybatis-plus-boot-starter.version>3.0.3</mybatis-plus-boot-starter.version>
         <mybatis-spring-boot.version>1.3.2</mybatis-spring-boot.version>
         <druid.version>1.1.9</druid.version>
         <swagger.version>2.9.2</swagger.version>