浙江医院质控整改

knowledgeman-service/src/main/java/com/diagbot/dto/RuleAppDTO.java

@@ -28,10 +28,10 @@ public class RuleAppDTO {
 //     */
 //    private Date gmtCreate;
 //
-//    /**
-//     * 记录修改时间,如果时间是1970年则表示纪录未修改
-//     */
-//    private Date gmtModified;
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
 //
 //    /**
 //     * 创建人，0表示无创建人值

knowledgeman-service/src/main/java/com/diagbot/facade/RuleAppFacade.java

@@ -1,13 +1,20 @@
 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.dto.RuleAppDTO;
 import com.diagbot.entity.RuleApp;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.RuleAppTypeEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.RuleAppServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.RuleAppIdVO;
 import com.diagbot.vo.RuleAppPageVO;
 import com.diagbot.vo.RuleAppSaveVO;
@@ -15,6 +22,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,9 +34,10 @@ import java.util.List;
 public class RuleAppFacade extends RuleAppServiceImpl {
 
     public IPage<RuleAppDTO> pageRuleApp(RuleAppPageVO ruleAppPageVO) {
-
         IPage<RuleAppDTO> res = new Page<>(ruleAppPageVO.getCurrent(), ruleAppPageVO.getSize());
-        IPage<RuleApp> page = this.page(ruleAppPageVO);
+        QueryWrapper<RuleApp> ruleAppQueryWrapper = new QueryWrapper<>();
+        ruleAppQueryWrapper.orderByDesc("gmt_modified", "id");
+        IPage<RuleApp> page = this.page(ruleAppPageVO, ruleAppQueryWrapper);
         BeanUtil.copyProperties(page, res);
         if (ListUtil.isNotEmpty(page.getRecords())) {
             List<RuleAppDTO> ruleAppDTOList = ListUtil.newArrayList();
@@ -55,8 +64,29 @@ public class RuleAppFacade extends RuleAppServiceImpl {
     }
 
     public Boolean saveRuleApp(@Valid @RequestBody RuleAppSaveVO ruleAppSaveVO) {
+        if (null == ruleAppSaveVO) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL);
+        }
         RuleApp ruleApp = new RuleApp();
         BeanUtil.copyProperties(ruleAppSaveVO, ruleApp);
+        String userId = UserUtils.getCurrentPrincipleID();
+        Date date = DateUtil.now();
+        ruleApp.setModifier(userId);
+        ruleApp.setGmtModified(date);
+        //查询id 是否存在
+        if (!IntegerUtil.isNull(ruleAppSaveVO.getId())) {
+            QueryWrapper<RuleApp> ruleAppQueryWrapper = new QueryWrapper<>();
+            ruleAppQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("id", ruleAppSaveVO.getId());
+            if (this.count(ruleAppQueryWrapper) < 1) {
+                ruleApp.setCreator(userId);
+                ruleApp.setGmtCreate(date);
+            }
+        } else {
+            ruleApp.setCreator(userId);
+            ruleApp.setGmtCreate(date);
+        }
+
         return this.saveOrUpdate(ruleApp);
     }
 }

knowledgeman-service/src/main/java/com/diagbot/facade/RulePubFacade.java

@@ -1,9 +1,12 @@
 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.dto.RulePubDTO;
 import com.diagbot.entity.RulePub;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.RulePubServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -25,9 +28,10 @@ import java.util.List;
 public class RulePubFacade extends RulePubServiceImpl {
 
     public IPage<RulePubDTO> pageRulePub(RulePubPageVO rulePubPageVO) {
-
         IPage<RulePubDTO> res = new Page<>(rulePubPageVO.getCurrent(), rulePubPageVO.getSize());
-        IPage<RulePub> page = this.page(rulePubPageVO);
+        QueryWrapper<RulePub> rulePubQueryWrapper = new QueryWrapper<>();
+        rulePubQueryWrapper.orderByDesc("id");
+        IPage<RulePub> page = this.page(rulePubPageVO, rulePubQueryWrapper);
         BeanUtil.copyProperties(page, res);
         if (ListUtil.isNotEmpty(page.getRecords())) {
             List<RulePubDTO> rulePubDTOList = ListUtil.newArrayList();
@@ -53,6 +57,9 @@ public class RulePubFacade extends RulePubServiceImpl {
     }
 
     public Boolean saveRulePub(@Valid @RequestBody RulePubSaveVO rulePubSaveVO) {
+        if (null == rulePubSaveVO) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL);
+        }
         RulePub rulePub = new RulePub();
         BeanUtil.copyProperties(rulePubSaveVO, rulePub);
         return this.saveOrUpdate(rulePub);

knowledgeman-service/src/main/java/com/diagbot/vo/RulePubSaveVO.java

@@ -15,7 +15,7 @@ public class RulePubSaveVO {
 
     private String pubName;
 
-    private String ruleType;
+//    private String ruleType;
 
     /**
      * 比较符