Merge branch 'develop' into dev/icssNCD

icssman-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -3,6 +3,7 @@ package com.diagbot.dto;
 import java.util.Date;
 
 import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.enums.DisclaimerCodeEnum;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -13,56 +14,133 @@ import lombok.Setter;
  * @Description: TODO
  * @date 2018年11月21日 下午4:23:48
  */
-@Setter
-@Getter
+
 public class DisclaimerInformationDTO {
 	private Long id;
 
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String modifier;
-
-    /**
-     * 主表id
-     */
-   // private Long versionId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 排序号
-     */
-    private String orderNo;
-
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
-
-    /**
-     * 免责申明位置
-     */
-    private String disclaimerCode;
-
-    /**
-     * 备注
-     */
-    private String remark;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String modifier;
+
+	/**
+	 * 主表id
+	 */
+	// private Long versionId;
+
+	/**
+	 * 标题
+	 */
+	private String title;
+
+	/**
+	 * 描述
+	 */
+	private String description;
+
+	/**
+	 * 排序号
+	 */
+	private String orderNo;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	/**
+	 * 免责申明位置
+	 */
+	private String disclaimerCode;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDisclaimerCode() {
+		if (disclaimerCode.equals("0")) {
+			return DisclaimerCodeEnum.getName(0);
+		} else if (disclaimerCode.equals("1")) {
+			return DisclaimerCodeEnum.getName(1);
+		} else if (disclaimerCode.equals("2")) {
+			return DisclaimerCodeEnum.getName(2);
+		} else {
+			return disclaimerCode;
+		}
+	}
+
+	public void setDisclaimerCode(String disclaimerCode) {
+		this.disclaimerCode = disclaimerCode;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 
 }

icssman-service/src/main/java/com/diagbot/dto/FileDTO.java

@@ -15,4 +15,13 @@ public class FileDTO {
     private String original;
     private String title;
     private String url;
+    private String info;
+
+    public FileDTO(String state, String info) {
+        this.state = state;
+        this.info = info;
+    }
+    public FileDTO(){
+
+    }
 }

icssman-service/src/main/java/com/diagbot/entity/DisclaimerInformation.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.enums.DisclaimerCodeEnum;
 
 /**
  * <p>
@@ -161,7 +162,7 @@ public class DisclaimerInformation implements Serializable {
         this.status = status;
     }
     public String getDisclaimerCode() {
-        return disclaimerCode;
+    	return disclaimerCode;
     }
 
     public void setDisclaimerCode(String disclaimerCode) {

icssman-service/src/main/java/com/diagbot/enums/DisclaimerCodeEnum.java

@@ -0,0 +1,47 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+
+import lombok.Setter;
+
+public enum DisclaimerCodeEnum implements KeyedNamed{
+	
+	DiagnoseDisclaimer(0, "诊断免责信息"),
+	PushLiability(1, "推送免责信息"),
+	Disclaimer(2,"免责申明");
+	
+	@Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DisclaimerCodeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DisclaimerCodeEnum getEnum(Integer key) {
+        for (DisclaimerCodeEnum item : DisclaimerCodeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+    	DisclaimerCodeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

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

@@ -47,7 +47,7 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
      * @param title
      * @return
      */
-    public List<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
+    public IPage<DisclaimerInformationDTO> getDisclaimerInformation(Page page, String title) {
 
         DisclaimerInformationAllVO disAll = new DisclaimerInformationAllVO();
         disAll.setTitle(title);
@@ -76,7 +76,7 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
 
             dataNew.add(dis);
         }
-        return dataNew;
+        return querDisclaimerInformation.setRecords(dataNew);
     }
 
     /**

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

@@ -35,6 +35,7 @@ import com.diagbot.vo.VersionDetailVO;
 import com.diagbot.vo.VersionInfoAllVO;
 import com.diagbot.vo.VersionInfoIdVO;
 import com.diagbot.vo.VersionInfoVO;
+import com.diagbot.vo.VersionWrapperNameVO;
 
 /**
  * @author wangfeng
@@ -56,19 +57,20 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
      *
      * @return
      */
-    public List<VersionWrapperDTO> getVersionInfoAll(Page page, String name) {
+    public IPage<VersionWrapperDTO> getVersionInfoAll(Page page,VersionWrapperNameVO versionWrapperNameVO) {
         // 模糊查询最新的一条版本信息
-        QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+       /* QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
         versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
                 .like("name", name).orderByDesc("refresh_time");
-
+      
         // 分页查询
-        IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
-        List<VersionInfo> versionInfos = queryUserInformation.getRecords();
+*/        //IPage<VersionInfo> queryUserInformation = page(page, versionInfoQuery);
+        IPage<VersionWrapperDTO> queryUserInformation = getVersionInfoAPage(page,versionWrapperNameVO);
+        List<VersionWrapperDTO> versionInfos = queryUserInformation.getRecords();
         List<VersionWrapperDTO> versionLists = new ArrayList<VersionWrapperDTO>();
         // 取出操作人id
         List<String> modifierid = new ArrayList<>();
-        modifierid = versionInfos.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+        modifierid = versionInfos.stream().map(ac -> ac.getModifierid()).collect(Collectors.toList());
         // 根据操作人的id获取操作人信息
         Map<String, String> userNames = new HashMap<>();
         if (ListUtil.isNotEmpty(modifierid)) {
@@ -79,12 +81,12 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
             userNames = userNamesDTO.data;
         }
         // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-		for (VersionInfo versionInfo : versionInfos) {
+		for (VersionWrapperDTO versionInfo : versionInfos) {
 			VersionWrapperDTO versionList = new VersionWrapperDTO();
 			versionList.setId(versionInfo.getId());
 			versionList.setGmtCreate(versionInfo.getGmtCreate());
 			versionList.setName(versionInfo.getName());
-			versionList.setModifierid(userNames.get(versionInfo.getModifier()));
+			versionList.setModifierid(userNames.get(versionInfo.getModifierid()));
 			versionList.setRefreshTime(versionInfo.getRefreshTime());
 			versionList.setStatus(versionInfo.getStatus());
 			versionList.setRemark(versionInfo.getRemark());
@@ -94,7 +96,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
         List<Long> ids = new ArrayList<>();
         if (versionInfos != null) {
             // 当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
-            for (VersionInfo versionInfo : versionInfos) {
+            for (VersionWrapperDTO versionInfo : versionInfos) {
                 ids.add(versionInfo.getId());
             }
             // 获取明细信息
@@ -111,7 +113,7 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
                 }
             }
         }
-        return versionLists;
+        return queryUserInformation.setRecords(versionLists);
 
     }
 

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

@@ -1,7 +1,14 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.VersionInfo;
+import com.diagbot.vo.VersionWrapperNameVO;
+
+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;
 
 /**
  * <p>
@@ -13,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface VersionInfoMapper extends BaseMapper<VersionInfo> {
 
+	public IPage<VersionWrapperDTO> getVersionInfoAPage(Page page, @Param("versionWrapperNameVO") VersionWrapperNameVO versionWrapperNameVO);
 }

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

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.VersionInfo;
+import com.diagbot.vo.VersionWrapperNameVO;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.diagbot.entity.VersionInfo;
  */
 public interface VersionInfoService extends IService<VersionInfo> {
 
+	  public IPage<VersionWrapperDTO> getVersionInfoAPage(Page page, VersionWrapperNameVO versionWrapperNameVO); 
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.enums.DisclaimerCodeEnum;
 import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.EnumsDataService;
@@ -27,6 +28,7 @@ public class EnumsDataServiceImpl implements EnumsDataService {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("questionTypeEnum", QuestionTypeEnum.values())
                 .addEnums("introducePositionEnum", IntroducePositionEnum.values())
+                .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
                 .build();
         return enumMap;
     }

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

@@ -3,8 +3,6 @@ package com.diagbot.service.impl;
 import com.diagbot.client.fastdfs.FastDFSClient;
 import com.diagbot.client.fastdfs.FastDFSFile;
 import com.diagbot.dto.FileDTO;
-import com.diagbot.exception.CommonException;
-import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.service.UploadService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,22 +21,20 @@ import java.io.InputStream;
 public class UploadServiceImpl implements UploadService {
     @Override
     public FileDTO singleFileUpload(MultipartFile file) {
-        FileDTO fileDTO = new FileDTO();
-
         if (file.isEmpty()) {
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件不能为空");
+            return new FileDTO("FAILURE", "文件不能为空");
         }
         //文件大小上限1M
         if (file.getSize() > 1024 * 1024) {
-            throw new CommonException(ServiceErrorCode.FILE_MAX_SIZE_LIMIT, "文件上传失败，超出大小限制1MB");
+            return new FileDTO("FAILURE", "文件上传失败，超出大小限制1MB");
         }
         try {
-            fileDTO = saveFile(file);
+            FileDTO fileDTO = saveFile(file);
+            return fileDTO;
         } catch (Exception e) {
             log.error("文件上传失败", e);
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
+            return new FileDTO("FAILURE", "文件上传失败，请重新上传");
         }
-        return fileDTO;
     }
 
 
@@ -48,7 +44,7 @@ public class UploadServiceImpl implements UploadService {
      * @throws IOException
      */
     public FileDTO saveFile(MultipartFile multipartFile) throws IOException {
-        FileDTO fileDTO = new FileDTO();
+
         String[] fileAbsolutePath = {};
         String fileName = multipartFile.getOriginalFilename();
         String ext = fileName.substring(fileName.lastIndexOf(".") + 1);
@@ -65,19 +61,18 @@ public class UploadServiceImpl implements UploadService {
             fileAbsolutePath = FastDFSClient.upload(file);  //upload to fastdfs
         } catch (Exception e) {
             log.error("文件上传异常", e);
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传异常");
+            return new FileDTO("FAILURE", "文件上传异常");
         }
         if (fileAbsolutePath == null) {
             log.error("文件上传失败，请重新上传");
-            throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
+            return new FileDTO("FAILURE", "文件上传失败，请重新上传");
         }
         String path = "/" + fileAbsolutePath[0] + "/" + fileAbsolutePath[1];
-        fileDTO.setState("SUCCESS");
+        FileDTO fileDTO = new FileDTO("SUCCESS", "文件上传成功");
         fileDTO.setUrl(path);
         fileDTO.setOriginal(multipartFile.getOriginalFilename());
         fileDTO.setTitle(multipartFile.getOriginalFilename());
         return fileDTO;
-
     }
 
     /**
@@ -86,7 +81,7 @@ public class UploadServiceImpl implements UploadService {
      * @param path
      * @return
      */
-    public Boolean deleteRemoteFile(String path) {
+    public FileDTO deleteRemoteFile(String path) {
         if (path.startsWith("/")) {
             path = path.substring(1);
         }
@@ -96,8 +91,8 @@ public class UploadServiceImpl implements UploadService {
             FastDFSClient.deleteFile(groupName, fileName);
         } catch (Exception e) {
             log.error("", e);
-            throw new CommonException(ServiceErrorCode.FILE_DELETE_ERROR, "文件删除失败");
+            return new FileDTO("FAILURE", "文件删除失败");
         }
-        return true;
+        return new FileDTO("SUCCESS", "文件删除成功");
     }
 }

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

@@ -1,9 +1,14 @@
 package com.diagbot.service.impl;
 
+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.VersionWrapperDTO;
 import com.diagbot.entity.VersionInfo;
 import com.diagbot.mapper.VersionInfoMapper;
 import com.diagbot.service.VersionInfoService;
+import com.diagbot.vo.VersionWrapperNameVO;
+
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class VersionInfoServiceImpl extends ServiceImpl<VersionInfoMapper, VersionInfo> implements VersionInfoService {
 
+	@Override
+	public IPage<VersionWrapperDTO> getVersionInfoAPage(Page page, VersionWrapperNameVO versionWrapperNameVO) {
+		// TODO Auto-generated method stub
+		return baseMapper.getVersionInfoAPage(page, versionWrapperNameVO);
+	}
+
 }

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

@@ -17,7 +17,7 @@ import lombok.Setter;
 public class DisclaimerInformationTitleVO extends Page{
 
 	/**
-     * 归属名称
+     * 名称
      */
     private String title;
 }

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

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
@@ -36,13 +37,13 @@ public class DisclaimerInformationController {
     @Autowired
     DisclaimerInformationFacade disclaimerInformationFacade;
 
-    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @ApiOperation(value = "分页查询获取免责申明[by:wangfeng]", notes = "分页查询获取免责申明")
     @PostMapping("/getDisclaimerInformations")
     @SysLogger("getDisclaimerInformations")
     @Transactional
-    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationTitleVO disclaimerInformationTitleVO) {
+    public RespDTO<IPage<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationTitleVO disclaimerInformationTitleVO) {
 
-        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationTitleVO, disclaimerInformationTitleVO.getTitle());
+    	IPage<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationTitleVO, disclaimerInformationTitleVO.getTitle());
 
         return RespDTO.onSuc(data);
     }

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

@@ -1,8 +1,7 @@
 package com.diagbot.web;
 
-import com.diagbot.dto.FileDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.UploadFacade;
+import com.diagbot.util.FastJsonUtils;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -23,12 +22,14 @@ public class UploadController {
 
     @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
     @PostMapping(value = "/uploadImage", produces = "application/json;charset=UTF-8")
-    public RespDTO<FileDTO> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
-        return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
+    public String singleFileUpload(@RequestParam("upfile") MultipartFile file) {
+        String data = FastJsonUtils.getBeanToJson(uploadFacade.singleFileUpload(file));
+        return data;
     }
 
     @PostMapping("/deleteRemoteFile")
-    public RespDTO<Boolean> deleteRemoteFile(@RequestParam("path") String path) {
-        return RespDTO.onSuc(uploadFacade.deleteRemoteFile(path));
+    public String deleteRemoteFile(@RequestParam("path") String path) {
+        String data = FastJsonUtils.getBeanToJson(uploadFacade.deleteRemoteFile(path));
+        return data;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.web;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionWrapperDTO;
@@ -38,9 +39,9 @@ public class VersionInfoController {
     @PostMapping("/getVersionInfoAlls")
     @SysLogger("getVersionInfoAlls")
     @Transactional
-    public RespDTO<List<VersionWrapperDTO>> getVersionInfoAlls(@RequestBody VersionWrapperNameVO versionWrapperNameVO) {
+    public RespDTO<IPage<VersionWrapperDTO>> getVersionInfoAlls(@RequestBody VersionWrapperNameVO versionWrapperNameVO) {
 
-        List<VersionWrapperDTO> data = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO, versionWrapperNameVO.getName());
+    	IPage<VersionWrapperDTO> data = versionInfoFacade.getVersionInfoAll(versionWrapperNameVO, versionWrapperNameVO);
 
         return RespDTO.onSuc(data);
     }

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

@@ -15,5 +15,22 @@
         <result column="status" property="status" />
         <result column="remark" property="remark" />
     </resultMap>
-
+    
+ <select id="getVersionInfoAPage" resultType="com.diagbot.dto.VersionWrapperDTO">
+	SELECT
+	id as id,
+	gmt_create as gmtCreate,
+	modifier as modifierid,
+	name as name,
+	refresh_time as
+	refreshTime,
+	status as status,
+	remark as remark
+	FROM icss_version_info u
+	WHERE u.is_deleted = 'N' AND u.status = 1
+	<if test="versionWrapperNameVO.name != null">
+		AND u.name LIKE CONCAT('%', #{versionWrapperNameVO.name}, '%')
+	</if>
+	ORDER BY u.refresh_time DESC
+</select>
 </mapper>