Merge remote-tracking branch 'origin/dev/icss' into debug

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

@@ -18,6 +18,7 @@ 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;
@@ -85,6 +86,14 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      * @return
      */
     public Boolean addDisclaimerInformation(DisclaimerInformationVO disclaimerInformationVO) {
+    	//每一处免责声明（免责声明按钮、推送免责声明、诊断免责声明）同时最多可启用1条内容，显示（按操作时间）最新的条记录；新添加免责声明，则自动展示新添加的内容；自动开启，最近一条数据自动停用；
+    	UpdateWrapper<DisclaimerInformation>  DisclaimerInformationStatus= new UpdateWrapper<>();
+    	DisclaimerInformationStatus.eq("disclaimer_code",disclaimerInformationVO.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        .set("modifier", UserUtils.getCurrentPrincipleID())
+        .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+    	
+    	update(new DisclaimerInformation(), DisclaimerInformationStatus);
+    	
         DisclaimerInformation disclaimerInformation = new DisclaimerInformation();
         disclaimerInformation.setCreator(UserUtils.getCurrentPrincipleID());
         disclaimerInformation.setModifier(UserUtils.getCurrentPrincipleID());
@@ -120,9 +129,9 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
         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.setOrderNo(disclaimerInformationAllVO.getOrderNo());
+        //disclaimerInformation.setRemark(disclaimerInformationAllVO.getRemark());
+        //disclaimerInformation.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
         disclaimerInformation.setTitle(disclaimerInformationAllVO.getTitle());
         disclaimerInformation.setVersionId(0L);
 
@@ -158,6 +167,14 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
     public boolean startDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
         // 1.先判断数据是否存在有效
         checkExist(disclaimerInformationIdVO.getId());
+        //每一处免责声明（免责声明按钮、推送免责声明、诊断免责声明）同时最多可启用1条内容，显示（按操作时间）最新的条记录；新添加免责声明，则自动展示新添加的内容；自动开启，最近一条数据自动停用；
+        UpdateWrapper<DisclaimerInformation>  DisclaimerInformationStatus= new UpdateWrapper<>();
+    	DisclaimerInformationStatus.eq("disclaimer_code",disclaimerInformationIdVO.getDisclaimerCode()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        .set("modifier", UserUtils.getCurrentPrincipleID())
+        .set("gmt_modified", DateUtil.now()).set("status", StatusEnum.Disable.getKey());
+    	
+    	update(new DisclaimerInformation(), DisclaimerInformationStatus);
+        
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
         disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("status", StatusEnum.Disable.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
@@ -170,11 +187,11 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      *
      * @return
      */
-    public boolean endDisclaimerInformations(DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    public boolean endDisclaimerInformations(DisclaimerInformationEndVO disclaimerInformationEndVO) {
         // 1.先判断数据是否存在有效
-        checkExist(disclaimerInformationIdVO.getId());
+        checkExist(disclaimerInformationEndVO.getId());
         UpdateWrapper<DisclaimerInformation> disclaimerInformationNew = new UpdateWrapper<>();
-        disclaimerInformationNew.in("id", disclaimerInformationIdVO.getId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+        disclaimerInformationNew.in("id", disclaimerInformationEndVO.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 DisclaimerInformation(), disclaimerInformationNew);

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

@@ -36,7 +36,7 @@ public class DisclaimerInformationAllVO {
     /**
      * 排序号
      */
-    private String orderNo;
+    //private String orderNo;
 
     /**
      * 1：启动，0：不启用
@@ -51,5 +51,5 @@ public class DisclaimerInformationAllVO {
     /**
      * 备注
      */
-    private String remark;
+    //private String remark;
 }

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

@@ -0,0 +1,19 @@
+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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import lombok.Getter;
@@ -17,4 +18,6 @@ public class DisclaimerInformationIdVO {
 
 	@NotNull(message = "请输入id")
 	private Long id;
+	@NotBlank(message = "请输入归属")
+	private String disclaimerCode;
 }

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

@@ -1,26 +1,28 @@
 package com.diagbot.web;
 
 
+import javax.validation.Valid;
+
+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 com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 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;
+
 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 javax.validation.Valid;
-import java.util.List;
 
 
 /**
@@ -96,9 +98,9 @@ public class DisclaimerInformationController {
     @PostMapping("/endDisclaimerInformations")
     @SysLogger("endDisclaimerInformations")
     @Transactional
-    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
+    public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationEndVO disclaimerInformationEndVO) {
 
-        boolean res = disclaimerInformationFacade.endDisclaimerInformations(disclaimerInformationIdVO);
+        boolean res = disclaimerInformationFacade.endDisclaimerInformations(disclaimerInformationEndVO);
 
         return RespDTO.onSuc(res);
     }

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 order_no
+		ORDER BY gmt_create
 	</select>
 </mapper>