优化翻页写法，优化代码格式

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

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -53,6 +54,7 @@ public class DisScaleFacade extends DisScaleServiceImpl {
      */
     public Boolean addDisScaleInfo(AddDisScaleInfoVO addDisScaleInfoVO) {
         String userId = UserUtils.getCurrentPrincipleID();
+        Date now = DateUtil.now();
         //判断诊断是否已被删除
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -71,7 +73,7 @@ public class DisScaleFacade extends DisScaleServiceImpl {
             updateWrapper.eq("dis_id", addDisScaleInfoVO.getDisId())
                     .set("is_deleted", IsDeleteEnum.Y.getKey())
                     .set("modifier", userId)
-                    .set("gmt_modified", DateUtil.now());
+                    .set("gmt_modified", now);
             this.update(new DisScale(), updateWrapper);
         }
         //重新添加标签
@@ -81,8 +83,8 @@ public class DisScaleFacade extends DisScaleServiceImpl {
             disScale = new DisScale();
             disScale.setCreator(userId);
             disScale.setModifier(userId);
-            disScale.setGmtCreate(DateUtil.now());
-            disScale.setGmtModified(DateUtil.now());
+            disScale.setGmtCreate(now);
+            disScale.setGmtModified(now);
             disScale.setScaleId(addDisScaleInfoVO.getScaleId().get(i));
             disScale.setDisId(addDisScaleInfoVO.getDisId());
             disScale.setOrderNo(i + 1);

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -51,18 +52,18 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 
 	/**
 	 * 分页模糊查询标签组维护接口
-	 * @param page
+	 *
 	 * @param evaluationModuleDiseaseNameVO
 	 * @return
 	 */
-	public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePage(Page page,EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
-		IPage<EvaluationModuleMappingDTO> datas = evaluationModuleMappingService.queryEvaluationModulePageAll(page,
-				evaluationModuleDiseaseNameVO);
+	public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePage(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
+		IPage<EvaluationModuleMappingDTO> datas
+				= evaluationModuleMappingService.queryEvaluationModulePageAll(evaluationModuleDiseaseNameVO);
 		List<EvaluationModuleMappingDTO> data = datas.getRecords();
-		List<String> modifierid = new ArrayList<>();
-		modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		List<String> modifierid
+				= data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
 		Map<String, String> userNames = new HashMap<>();
-		if (modifierid.size() > 0) {
+		if (ListUtil.isNotEmpty(modifierid)) {
 			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
 			if (RespDTOUtil.respIsNG(userNamesDTO)) {
 				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
@@ -72,16 +73,8 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		List<EvaluationModuleMappingDTO> evaluationLists = new ArrayList<EvaluationModuleMappingDTO>();
 		for (EvaluationModuleMappingDTO evalua : data) {
 			EvaluationModuleMappingDTO dateNew = new EvaluationModuleMappingDTO();
-			dateNew.setId(evalua.getId());
-			dateNew.setCreator(evalua.getCreator());
-			dateNew.setGmtModified(evalua.getGmtModified());
-			dateNew.setDiseaseId(evalua.getDiseaseId());
-			dateNew.setGmtCreate(evalua.getGmtCreate());
+			BeanUtil.copyProperties(evalua,dateNew);
 			dateNew.setModifier(userNames.get(evalua.getModifier()));
-			dateNew.setOrderNo(evalua.getOrderNo());
-			dateNew.setRegionName(evalua.getRegionName());
-			dateNew.setRegionType(evalua.getRegionType());
-			dateNew.setDiseaseName(evalua.getDiseaseName());
 			evaluationLists.add(dateNew);
 		}
 

icssman-service/src/main/java/com/diagbot/mapper/EvaluationModuleMappingMapper.java

@@ -1,13 +1,11 @@
 package com.diagbot.mapper;
 
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.entity.EvaluationModuleMapping;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -20,6 +18,6 @@ import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
  */
 public interface EvaluationModuleMappingMapper extends BaseMapper<EvaluationModuleMapping> {
 
-	IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(Page page, @Param("evaluationModule") EvaluationModuleDiseaseNameVO evaluationModule);
+    IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(@Param("evaluationModule") EvaluationModuleDiseaseNameVO evaluationModule);
 
 }

icssman-service/src/main/java/com/diagbot/service/EvaluationModuleMappingService.java

@@ -1,11 +1,10 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.entity.EvaluationModuleMapping;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -17,6 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface EvaluationModuleMappingService extends IService<EvaluationModuleMapping> {
 
-	public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(Page page, EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO);
+    IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO);
 
 }

icssman-service/src/main/java/com/diagbot/service/impl/EvaluationModuleMappingServiceImpl.java

@@ -1,15 +1,13 @@
 package com.diagbot.service.impl;
 
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.EvaluationModuleMappingDTO;
 import com.diagbot.entity.EvaluationModuleMapping;
 import com.diagbot.mapper.EvaluationModuleMappingMapper;
 import com.diagbot.service.EvaluationModuleMappingService;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -22,11 +20,11 @@ import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
 @Service
 public class EvaluationModuleMappingServiceImpl extends ServiceImpl<EvaluationModuleMappingMapper, EvaluationModuleMapping> implements EvaluationModuleMappingService {
 
-	@Override
-	public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(Page page, EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
-		return baseMapper.queryEvaluationModulePageAll(page, evaluationModuleDiseaseNameVO);
-		
-	}
+    @Override
+    public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
+        return baseMapper.queryEvaluationModulePageAll(evaluationModuleDiseaseNameVO);
+
+    }
+
 
-	
 }

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

@@ -1,15 +1,6 @@
 package com.diagbot.web;
 
 
-import java.util.List;
-
-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.EvaluationModuleAllDTO;
@@ -19,9 +10,16 @@ import com.diagbot.facade.EvaluationModuleMappingFacade;
 import com.diagbot.vo.EvaluationModuleDiseaseIdVO;
 import com.diagbot.vo.EvaluationModuleDiseaseNameVO;
 import com.diagbot.vo.EvaluationModuleListVO;
-
 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 java.util.List;
 
 /**
  * <p>
@@ -37,70 +35,70 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class EvaluationModuleMappingController {
 
-	@Autowired
-	EvaluationModuleMappingFacade evaluationModuleMappingFacade;
-	
-	
-	@ApiOperation(value = "2期-分页模糊查询标签组维护接口[by:wangfeng]", notes = "diseaseName : 疾病名")
+    @Autowired
+    EvaluationModuleMappingFacade evaluationModuleMappingFacade;
+
+
+    @ApiOperation(value = "2期-分页模糊查询标签组维护接口[by:wangfeng]", notes = "diseaseName : 疾病名")
     @PostMapping("/queryEvaluationModulePages")
     @SysLogger("queryEvaluationModulePages")
-    @Transactional
-    public RespDTO<IPage<EvaluationModuleMappingDTO>> queryEvaluationModulePages(@RequestBody EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO ) {
+    public RespDTO<IPage<EvaluationModuleMappingDTO>> queryEvaluationModulePages(@RequestBody EvaluationModuleDiseaseNameVO evaluationModuleDiseaseNameVO) {
 
-    	IPage<EvaluationModuleMappingDTO> data = evaluationModuleMappingFacade.queryEvaluationModulePage(evaluationModuleDiseaseNameVO, evaluationModuleDiseaseNameVO);
+        IPage<EvaluationModuleMappingDTO> data
+                = evaluationModuleMappingFacade.queryEvaluationModulePage(evaluationModuleDiseaseNameVO);
 
         return RespDTO.onSuc(data);
     }
 
-	@ApiOperation(value = "2期-获取慢病标签组维护[by:wangfeng]", notes = "疾病ID ： diseaseId")
+    @ApiOperation(value = "2期-获取慢病标签组维护[by:wangfeng]", notes = "疾病ID ： diseaseId")
     @PostMapping("/getEvaluationModuleLists")
     @SysLogger("getEvaluationModuleLists")
-    @Transactional
     public RespDTO<List<EvaluationModuleAllDTO>> getEvaluationModuleLists(@RequestBody EvaluationModuleDiseaseIdVO evaluationModuleDiseaseIdVO) {
 
-		List<EvaluationModuleAllDTO> data = evaluationModuleMappingFacade.getEvaluationModuleList(evaluationModuleDiseaseIdVO);
+        List<EvaluationModuleAllDTO> data = evaluationModuleMappingFacade.getEvaluationModuleList(evaluationModuleDiseaseIdVO);
 
         return RespDTO.onSuc(data);
     }
-	
-	@ApiOperation(value = "2期-慢病评估维护——修改管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
-			+ "evaluationModuleData:{ 区域名 regionName;"
-			+ "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
-			+ "区域顺序 ：orderNo; "
-			+ "疾病id： diseaseId;"
-			+ "备注：remark;} ")
+
+    @ApiOperation(value = "2期-慢病评估维护——修改管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
+            + "evaluationModuleData:{ 区域名 regionName;"
+            + "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
+            + "区域顺序 ：orderNo; "
+            + "疾病id： diseaseId;"
+            + "备注：remark;} ")
     @PostMapping("/updateEvaluationModuleLists")
     @SysLogger("updateEvaluationModuleLists")
     @Transactional
     public RespDTO<Boolean> updateEvaluationModuleLists(@RequestBody EvaluationModuleListVO evaluationModuleListVO) {
 
-		boolean res = evaluationModuleMappingFacade.updateEvaluationModuleList(evaluationModuleListVO);
+        boolean res = evaluationModuleMappingFacade.updateEvaluationModuleList(evaluationModuleListVO);
 
         return RespDTO.onSuc(res);
     }
-	@ApiOperation(value = "2期-慢病评估维护——添加管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
-			+ "evaluationModuleData:{ 区域名 regionName;"
-			+ "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
-			+ "区域顺序 ：orderNo; "
-			+ "疾病id： diseaseId;"
-			+ "备注：remark;} ")
+
+    @ApiOperation(value = "2期-慢病评估维护——添加管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
+            + "evaluationModuleData:{ 区域名 regionName;"
+            + "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
+            + "区域顺序 ：orderNo; "
+            + "疾病id： diseaseId;"
+            + "备注：remark;} ")
     @PostMapping("/saveEvaluationModuleLists")
     @SysLogger("saveEvaluationModuleLists")
     @Transactional
     public RespDTO<Boolean> saveEvaluationModuleLists(@RequestBody EvaluationModuleListVO evaluationModuleListVO) {
 
-		boolean res = evaluationModuleMappingFacade.saveEvaluationModuleList(evaluationModuleListVO);
+        boolean res = evaluationModuleMappingFacade.saveEvaluationModuleList(evaluationModuleListVO);
 
         return RespDTO.onSuc(res);
     }
-	
-	@ApiOperation(value = "2期-删除慢病标签组维护[by:wangfeng]", notes = "diseaseId ：疾病id")
+
+    @ApiOperation(value = "2期-删除慢病标签组维护[by:wangfeng]", notes = "diseaseId ：疾病id")
     @PostMapping("/cancelEvaluationModuleAlls")
     @SysLogger("cancelEvaluationModuleAlls")
     @Transactional
     public RespDTO<Boolean> cancelEvaluationModuleAlls(@RequestBody EvaluationModuleDiseaseIdVO evaluationModuleDiseaseIdVO) {
 
-		boolean res = evaluationModuleMappingFacade.cancelEvaluationModuleAll(evaluationModuleDiseaseIdVO);
+        boolean res = evaluationModuleMappingFacade.cancelEvaluationModuleAll(evaluationModuleDiseaseIdVO);
 
         return RespDTO.onSuc(res);
     }