启用接口修改

icssman-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -1,5 +1,14 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,17 +27,8 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DisclaimerInformationAllVO;
-import com.diagbot.vo.DisclaimerInformationEndVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationVO;
-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
@@ -168,8 +168,12 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
         // 1.先判断数据是否存在有效
         checkExist(disclaimerInformationIdVO.getId());
         //每一处免责声明（免责声明按钮、推送免责声明、诊断免责声明）同时最多可启用1条内容，显示（按操作时间）最新的条记录；新添加免责声明，则自动展示新添加的内容；自动开启，最近一条数据自动停用；
+      //  QueryWrapper<DisclaimerInformation> data = new QueryWrapper<DisclaimerInformation>();
+       // data.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+        DisclaimerInformation disclaimerInformation = getById(disclaimerInformationIdVO.getId());
+        
         UpdateWrapper<DisclaimerInformation>  DisclaimerInformationStatus= new UpdateWrapper<>();
-    	DisclaimerInformationStatus.eq("disclaimer_code",disclaimerInformationIdVO.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+    	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());
     	
@@ -187,7 +191,7 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      *
      * @return
      */
-    public boolean endDisclaimerInformations(DisclaimerInformationEndVO disclaimerInformationEndVO) {
+    public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationEndVO) {
         // 1.先判断数据是否存在有效
         checkExist(disclaimerInformationEndVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationEndVO.java

@@ -1,19 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年3月5日 下午6:27:48
- */
-@Getter
-@Setter
-public class DisclaimerInformationEndVO {
-
-	@NotNull(message = "请输入id")
-	private Long id;
-}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationIdVO.java

@@ -18,6 +18,5 @@ public class DisclaimerInformationIdVO {
 
 	@NotNull(message = "请输入id")
 	private Long id;
-	@NotBlank(message = "请输入归属")
-	private String disclaimerCode;
+	
 }

icssman-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -16,7 +16,6 @@ import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DisclaimerInformationFacade;
 import com.diagbot.vo.DisclaimerInformationAllVO;
-import com.diagbot.vo.DisclaimerInformationEndVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationTitleVO;
 import com.diagbot.vo.DisclaimerInformationVO;
@@ -98,7 +97,7 @@ public class DisclaimerInformationController {
     @PostMapping("/endDisclaimerInformations")
     @SysLogger("endDisclaimerInformations")
     @Transactional
-    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationEndVO disclaimerInformationEndVO) {
+    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationEndVO) {
 
         boolean res = disclaimerInformationFacade.endDisclaimerInformations(disclaimerInformationEndVO);
 

icssman-service/src/main/resources/mapper/DisclaimerInformationMapper.xml

@@ -35,6 +35,6 @@
 		<if test="disAll.title != null">
 		and title like concat('%',#{disAll.title},'%')
 		</if>
-		ORDER BY gmt_create
+		ORDER BY gmt_create DESC
 	</select>
 </mapper>