浏览代码

免责声明

wangfeng 4 年之前
父节点
当前提交
fc528aa166

+ 30 - 0
cdssman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -0,0 +1,30 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.UserServiceHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Token;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 调用用户服务
+ * @author: gaodm
+ * @time: 2018/8/6 9:52
+ */
+@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
+public interface UserServiceClient {
+
+    @PostMapping(value = "/user/getUserInfoByIds")
+    RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids);
+
+    @PostMapping("/user/verifyToken")
+    RespDTO<Boolean> verifyToken(@RequestBody Token token);
+}
+
+
+

+ 35 - 0
cdssman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -0,0 +1,35 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Token;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Description: 调用用户服务
+ * @author: gaodm
+ * @time: 2018/8/6 9:52
+ */
+@Component
+@Slf4j
+public class UserServiceHystrix implements UserServiceClient {
+
+    @Override
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids) {
+        log.error("【hystrix】调用{}异常", "getUserInfoByIds");
+        return null;
+    }
+
+    @Override
+    public RespDTO<Boolean> verifyToken(Token token) {
+        log.error("【hystrix】调用{}异常", "verifyToken");
+        return null;
+    }
+
+}

+ 60 - 0
cdssman-service/src/main/java/com/diagbot/dto/DisclaimerInfoDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 10:57
+ */
+@Getter
+@Setter
+public class DisclaimerInfoDTO {
+
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String modifier;
+
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1:启动,0:不启用
+     */
+    private String status;
+
+    /**
+     * 免责申明位置
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}
+

+ 7 - 6
cdssman-service/src/main/java/com/diagbot/entity/DisclaimerInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -30,12 +31,12 @@ public class DisclaimerInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人,0表示无创建人值
@@ -91,18 +92,18 @@ public class DisclaimerInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

+ 21 - 0
cdssman-service/src/main/java/com/diagbot/entity/Token.java

@@ -0,0 +1,21 @@
+package com.diagbot.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 11:08
+ */
+@Getter
+@Setter
+public class Token implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+
+}

+ 199 - 0
cdssman-service/src/main/java/com/diagbot/facade/DisclaimerInfoFacade.java

@@ -0,0 +1,199 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.DisclaimerInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DisclaimerInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.DisclaimerInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DisclaimerInfoIdVO;
+import com.diagbot.vo.DisclaimerInfoTitleVO;
+import com.diagbot.vo.DisclaimerInfoVO;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 10:54
+ */
+@Component
+public class DisclaimerInfoFacade extends DisclaimerInfoServiceImpl {
+    @Autowired
+    UserServiceClient userServiceClient;
+
+    public IPage<DisclaimerInfoDTO> getDisclaimerInformation(DisclaimerInfoTitleVO disclaimerInfoTitleVO) {
+        IPage<DisclaimerInfoDTO> querDisclaimerInformation = getDisclaimerInformationAll(disclaimerInfoTitleVO);
+        List<DisclaimerInfoDTO> data = querDisclaimerInformation.getRecords();
+
+        List<String> modifierid = new ArrayList<>();
+        modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+
+        Map<String, String> userNames = new HashMap<>();
+        if (ListUtil.isNotEmpty(modifierid)) {
+            RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+            if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "获取所有用户信息失败");
+            }
+            userNames = userNamesDTO.data;
+        }
+        List<DisclaimerInfoDTO> dataNew = new ArrayList<DisclaimerInfoDTO>();
+        for (DisclaimerInfoDTO disclaimerInformationDTO : data) {
+            DisclaimerInfoDTO dis = new DisclaimerInfoDTO();
+            BeanUtil.copyProperties(disclaimerInformationDTO, dis);
+            dis.setModifier(userNames.get(disclaimerInformationDTO.getModifier()));
+            dataNew.add(dis);
+        }
+        return querDisclaimerInformation.setRecords(dataNew);
+    }
+
+    public boolean addDisclaimerInformation(DisclaimerInfoVO disclaimerInfoVO) {
+        //每一处免责声明(免责声明按钮、推送免责声明、诊断免责声明)同时最多可启用1条内容,显示(按操作时间)最新的条记录;新添加免责声明,则自动展示新添加的内容;自动开启,最近一条数据自动停用;
+        UpdateWrapper<DisclaimerInfo> DisclaimerInformationStatus = new UpdateWrapper<>();
+        DisclaimerInformationStatus.eq("disclaimer_code", disclaimerInfoVO.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+
+        update(new DisclaimerInfo(), DisclaimerInformationStatus);
+
+        DisclaimerInfo disclaimerInformation = new DisclaimerInfo();
+        disclaimerInformation.setCreator(UserUtils.getCurrentPrincipleID());
+        disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
+        disclaimerInformation.setDescription(disclaimerInfoVO.getDescription());
+        disclaimerInformation.setDisclaimerCode(disclaimerInfoVO.getDisclaimerCode());
+        disclaimerInformation.setGmtCreate(DateUtil.now());
+        disclaimerInformation.setGmtModified(DateUtil.now());
+        disclaimerInformation.setOrderNo(disclaimerInfoVO.getOrderNo());
+        disclaimerInformation.setRemark(disclaimerInfoVO.getRemark());
+        disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        disclaimerInformation.setTitle(disclaimerInfoVO.getTitle());
+        //disclaimerInformation.setVersionId();
+
+        boolean res = save(disclaimerInformation);
+
+        return res;
+    }
+
+    public boolean updateDisclaimerInformation(DisclaimerInformationAllVO disclaimerInformationAllVO) {
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInformationAllVO.getId());
+        // 2.修改版本详情信息
+        DisclaimerInfo disclaimerInformation = new DisclaimerInfo();
+
+        disclaimerInformation.setGmtModified(DateUtil.now());// 修改时间
+        disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
+        disclaimerInformation.setDescription(disclaimerInformationAllVO.getDescription());
+        disclaimerInformation.setDisclaimerCode(disclaimerInformationAllVO.getDisclaimerCode());
+        disclaimerInformation.setGmtCreate(DateUtil.now());
+        disclaimerInformation.setId(disclaimerInformationAllVO.getId());
+        //disclaimerInformation.setOrderNo(disclaimerInformationAllVO.getOrderNo());
+        //disclaimerInformation.setRemark(disclaimerInformationAllVO.getRemark());
+        //disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+        disclaimerInformation.setTitle(disclaimerInformationAllVO.getTitle());
+
+        boolean res = updateById(disclaimerInformation);
+
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+
+        return res;
+    }
+
+    /**
+     * 删除
+     *
+     * @return
+     */
+    public Boolean cancelDisclaimerInformation(DisclaimerInfoIdVO disclaimerInformationIdVO) {
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInformationIdVO.getId());
+        UpdateWrapper<DisclaimerInfo> disclaimerInformationNew = new UpdateWrapper<>();
+        disclaimerInformationNew
+                .eq("id", disclaimerInformationIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        return update(new DisclaimerInfo(), disclaimerInformationNew);
+    }
+
+    /**
+     * 启用
+     *
+     * @return
+     */
+    public boolean startDisclaimerInformations(DisclaimerInfoIdVO disclaimerInfoIdVO) {
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInfoIdVO.getId());
+        //每一处免责声明(免责声明按钮、推送免责声明、诊断免责声明)同时最多可启用1条内容,显示(按操作时间)最新的条记录;新添加免责声明,则自动展示新添加的内容;自动开启,最近一条数据自动停用;
+        //  QueryWrapper<DisclaimerInformation> data = new QueryWrapper<DisclaimerInformation>();
+        // data.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+        DisclaimerInfo disclaimerInformation = getById(disclaimerInfoIdVO.getId());
+
+        UpdateWrapper<DisclaimerInfo> DisclaimerInformationStatus = new UpdateWrapper<>();
+        DisclaimerInformationStatus.eq("disclaimer_code", disclaimerInformation.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+
+        update(new DisclaimerInfo(), DisclaimerInformationStatus);
+
+        UpdateWrapper<DisclaimerInfo> disclaimerInformationNew = new UpdateWrapper<>();
+        disclaimerInformationNew
+                .eq("id", disclaimerInfoIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Enable.getKey());
+        return update(new DisclaimerInfo(), disclaimerInformationNew);
+    }
+
+    /**
+     * 停用
+     *
+     * @return
+     */
+    public boolean endDisclaimerInformations(DisclaimerInfoIdVO disclaimerInfoIdVO) {
+        // 1.先判断数据是否存在有效
+        checkExist(disclaimerInfoIdVO.getId());
+        UpdateWrapper<DisclaimerInfo> disclaimerInformationNew = new UpdateWrapper<>();
+        disclaimerInformationNew
+                .eq("id", disclaimerInfoIdVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Enable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+        return update(new DisclaimerInfo(), disclaimerInformationNew);
+    }
+
+
+    /**
+     * 判断数据是否存在有效
+     *
+     * @param id
+     */
+    private void checkExist(Long id) {
+        QueryWrapper<DisclaimerInfo> disclaimerInformationFand = new QueryWrapper<>();
+        disclaimerInformationFand.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("id", id);
+        int sum = count(disclaimerInformationFand);
+        if (sum == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据不存在");
+        }
+    }
+}
+

+ 5 - 1
cdssman-service/src/main/java/com/diagbot/mapper/DisclaimerInfoMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.DisclaimerInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DisclaimerInfoDTO;
+import com.diagbot.entity.DisclaimerInfo;
+import com.diagbot.vo.DisclaimerInfoTitleVO;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DisclaimerInfoMapper extends BaseMapper<DisclaimerInfo> {
 
+    IPage<DisclaimerInfoDTO> getDisclaimerInfoAll(DisclaimerInfoTitleVO disclaimerInfoTitleVO);
 }

+ 5 - 1
cdssman-service/src/main/java/com/diagbot/service/DisclaimerInfoService.java

@@ -1,7 +1,10 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.DisclaimerInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DisclaimerInfoDTO;
+import com.diagbot.entity.DisclaimerInfo;
+import com.diagbot.vo.DisclaimerInfoTitleVO;
 
 /**
  * <p>
@@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-08-05
  */
 public interface DisclaimerInfoService extends IService<DisclaimerInfo> {
+    public IPage<DisclaimerInfoDTO> getDisclaimerInformationAll(DisclaimerInfoTitleVO disclaimerInfoTitleVO);
 
 }

+ 8 - 1
cdssman-service/src/main/java/com/diagbot/service/impl/DisclaimerInfoServiceImpl.java

@@ -1,9 +1,12 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DisclaimerInfoDTO;
 import com.diagbot.entity.DisclaimerInfo;
 import com.diagbot.mapper.DisclaimerInfoMapper;
 import com.diagbot.service.DisclaimerInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.DisclaimerInfoTitleVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class DisclaimerInfoServiceImpl extends ServiceImpl<DisclaimerInfoMapper, DisclaimerInfo> implements DisclaimerInfoService {
 
+    @Override
+    public IPage<DisclaimerInfoDTO> getDisclaimerInformationAll(DisclaimerInfoTitleVO disclaimerInfoTitleVO) {
+        return baseMapper.getDisclaimerInfoAll(disclaimerInfoTitleVO);
+    }
 }

+ 19 - 0
cdssman-service/src/main/java/com/diagbot/vo/DisclaimerInfoIdVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 13:25
+ */
+@Setter
+@Getter
+public class DisclaimerInfoIdVO {
+    @NotNull(message = "请输入id")
+    private Long id;
+
+}

+ 19 - 0
cdssman-service/src/main/java/com/diagbot/vo/DisclaimerInfoTitleVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 10:58
+ */
+@Setter
+@Getter
+public class DisclaimerInfoTitleVO extends Page {
+    /**
+     * 名称
+     */
+    private String title;
+}

+ 42 - 0
cdssman-service/src/main/java/com/diagbot/vo/DisclaimerInfoVO.java

@@ -0,0 +1,42 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 11:16
+ */
+@Setter
+@Getter
+public class DisclaimerInfoVO {
+    /**
+     * 标题
+     */
+    @NotBlank(message = "标题不能为空")
+    private String title;
+
+    /**
+     * 描述
+     */
+    @NotBlank(message = "内容不能为空")
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

+ 38 - 0
cdssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationAllVO.java

@@ -0,0 +1,38 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-05 13:22
+ */
+@Getter
+@Setter
+public class DisclaimerInformationAllVO {
+
+    @NotNull(message = "请输入id")
+    private Long id;
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    //private String remark;
+}

+ 75 - 2
cdssman-service/src/main/java/com/diagbot/web/DisclaimerInfoController.java

@@ -1,9 +1,25 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DisclaimerInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisclaimerInfoFacade;
+import com.diagbot.vo.DisclaimerInfoIdVO;
+import com.diagbot.vo.DisclaimerInfoTitleVO;
+import com.diagbot.vo.DisclaimerInfoVO;
+import com.diagbot.vo.DisclaimerInformationAllVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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 org.springframework.stereotype.Controller;
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -13,8 +29,65 @@ import org.springframework.stereotype.Controller;
  * @author wangfeng
  * @since 2020-08-05
  */
-@Controller
+@RestController
 @RequestMapping("/disclaimerInfo")
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "免责申明详情API" })
+@SuppressWarnings("unchecked")
 public class DisclaimerInfoController {
+    @Autowired
+    DisclaimerInfoFacade disclaimerInfoFacade;
 
+    @ApiOperation(value = "分页查询获取免责申明[by:wangfeng]", notes = "分页查询获取免责申明")
+    @PostMapping("/getDisclaimerPages")
+    @SysLogger("getDisclaimerPages")
+    @Transactional
+    public RespDTO<IPage<DisclaimerInfoDTO>> getDisclaimerInformations(@RequestBody DisclaimerInfoTitleVO disclaimerInfoTitleVO) {
+        IPage<DisclaimerInfoDTO> data = disclaimerInfoFacade.getDisclaimerInformation(disclaimerInfoTitleVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "增加免责申明详情[by:wangfeng]", notes = "增加免责申明详情")
+    @PostMapping("/addDisclaimerInfos")
+    @SysLogger("addDisclaimerInfos")
+    @Transactional
+    public RespDTO<Boolean> addDisclaimerInformations(@Valid @RequestBody DisclaimerInfoVO disclaimerInfoVO) {
+        boolean res = disclaimerInfoFacade.addDisclaimerInformation(disclaimerInfoVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "修改免责申明详情[by:wangfeng]", notes = "修改免责申明详情")
+    @PostMapping("/updateDisclaimerInformations")
+    @SysLogger("updateDisclaimerInformations")
+    @Transactional
+    public RespDTO<Boolean> updateDisclaimerInformations(@Valid @RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
+        boolean res = disclaimerInfoFacade.updateDisclaimerInformation(disclaimerInformationAllVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "删除免责申明详情[by:wangfeng]", notes = "删除免责申明详情")
+    @PostMapping("/cancelDisclaimerInformations")
+    @SysLogger("cancelDisclaimerInformations")
+    @Transactional
+    public RespDTO<Boolean> cancelDisclaimerInformations(@Valid @RequestBody DisclaimerInfoIdVO disclaimerInfoIdVO) {
+        boolean res = disclaimerInfoFacade.cancelDisclaimerInformation(disclaimerInfoIdVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "启用免责申明详情[by:wangfeng]", notes = "启用免责申明详情")
+    @PostMapping("/startDisclaimerInformations")
+    @SysLogger("startDisclaimerInformations")
+    @Transactional
+    public RespDTO<Boolean> startDisclaimerInformations(@Valid @RequestBody DisclaimerInfoIdVO disclaimerInfoIdVO) {
+        boolean res = disclaimerInfoFacade.startDisclaimerInformations(disclaimerInfoIdVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "停用免责申明详情[by:wangfeng]", notes = "停用免责申明详情")
+    @PostMapping("/endDisclaimerInformations")
+    @SysLogger("endDisclaimerInformations")
+    @Transactional
+    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInfoIdVO disclaimerInfoIdVO) {
+        boolean res = disclaimerInfoFacade.endDisclaimerInformations(disclaimerInfoIdVO);
+        return RespDTO.onSuc(res);
+    }
 }

+ 30 - 13
cdssman-service/src/main/resources/mapper/DisclaimerInfoMapper.xml

@@ -4,18 +4,35 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.DisclaimerInfo">
-        <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="title" property="title" />
-        <result column="description" property="description" />
-        <result column="order_no" property="orderNo" />
-        <result column="status" property="status" />
-        <result column="disclaimer_code" property="disclaimerCode" />
-        <result column="remark" property="remark" />
+        <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="title" property="title"/>
+        <result column="description" property="description"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="status" property="status"/>
+        <result column="disclaimer_code" property="disclaimerCode"/>
+        <result column="remark" property="remark"/>
     </resultMap>
-
+    <select id="getDisclaimerInfoAll" resultType="com.diagbot.dto.DisclaimerInfoDTO">
+        SELECT
+        id as id,
+        gmt_create as gmtCreate,
+        modifier as modifier,
+        title as title,
+        description as description,
+        order_no as orderNo,
+        status as status,
+        disclaimer_code as disclaimerCode,
+        remark as remark
+        FROM sys_disclaimer_info
+        WHERE is_deleted = "N"
+        <if test="title != null and title != ''">
+            and UPPER(title) like concat('%',UPPER(trim(#{title})),'%')
+        </if>
+        ORDER BY gmt_create DESC
+    </select>
 </mapper>