Merge branch 'dev/icss' into debug

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

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/12/18 17:08
+ */
+@Getter
+@Setter
+public class FileDTO {
+    private String state;
+    private String original;
+    private String title;
+    private String url;
+}

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

@@ -90,6 +90,11 @@ public class QuestionDetail implements Serializable {
      */
     private Integer code;
 
+    /**
+     * 是否异常
+     */
+    private Integer abnormal;
+
     /**
      * 备注
      */

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

@@ -62,7 +62,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      */
     public Boolean saveIntroduce(IntroduceVO introduceVO) {
         IntroduceInfo introduceInfo = new IntroduceInfo();
-        if (!(introduceVO.getId() == null)) {
+        if (!(introduceVO.getId() == null||introduceInfo.getId().equals(0))) {
             introduceInfo = this.getById(introduceVO.getId());
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtModified(DateUtil.now());

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

@@ -27,7 +27,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddTagRetrievalDetailVO;
 import com.diagbot.vo.AddTagRetrievalVO;
-import com.diagbot.vo.DelRetrievalsByMapsVO;
+import com.diagbot.vo.DelRetrievalsByQuesIdVO;
 import com.diagbot.vo.GetRetrievalsByTagVO;
 import com.diagbot.vo.RetrievalListVO;
 
@@ -58,23 +58,25 @@ public class RetrievalFacade extends RetrievalServiceImpl {
     /**
      * 根据映射关系删除标签的同义词
      *
-     * @param delRetrievalsByMapsVO
+     * @param delRetrievalsByQuesIdVO
      * @return
      */
-    public Boolean delRetrievalsByMaps(DelRetrievalsByMapsVO delRetrievalsByMapsVO) {
+    public Boolean delRetrievalsByQuesId(DelRetrievalsByQuesIdVO delRetrievalsByQuesIdVO) {
     	QueryWrapper<RetrievalMapping> mappingQe = new QueryWrapper<>();
+    	mappingQe.eq("question_id", delRetrievalsByQuesIdVO.getQuestionId());
+    	
 		String userId = UserUtils.getCurrentPrincipleID();
 		RetrievalMapping retrievalMapping = new RetrievalMapping();
 		retrievalMapping.setGmtModified(DateUtil.now());
 		retrievalMapping.setModifier(userId);
 		retrievalMapping.setIsDeleted("Y");
-		mappingQe.in("id", delRetrievalsByMapsVO.getRetrievalMappingIds());
+		
 		retrievalMappingFacade.update(retrievalMapping, mappingQe);
 		return true;
     }
 
     /**
-     * 标签添加同义词
+     * 添加或者编辑标签同义词
      *
      * @param addTagRetrievalVO
      * @return
@@ -132,6 +134,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         
         retrievals.forEach(i->{
         	RetrievalMapping retrievalMapping = retrievalMappingMap.get(i.getId());
+        	AddTagRetrievalDetailVO detail = detailMap.get(i.getName());
         	if(retrievalMapping==null){
         		retrievalMapping = new RetrievalMapping();
         		retrievalMapping.setQuestionId(addTagRetrievalVO.getQuestionId());
@@ -140,14 +143,17 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         		retrievalMapping.setGmtModified(now);
         		retrievalMapping.setCreator(userId);
         		retrievalMapping.setModifier(userId);
+        		retrievalMapping.setShowType(detail.getRetrievalType());
+        		addOrUpdateRetrievalMappings.add(retrievalMapping);
         	}else{
-        		if(detailMap.get(i.getName()).getRetrievalType()!=retrievalMapping.getShowType()){
+        		if(detail.getRetrievalType()!=retrievalMapping.getShowType()||retrievalMapping.getIsDeleted().equals("Y")){
         			retrievalMapping.setShowType(detailMap.get(i.getName()).getRetrievalType());
         			retrievalMapping.setGmtModified(now);
         			retrievalMapping.setModifier(userId);
+        			retrievalMapping.setIsDeleted("N");
+        			addOrUpdateRetrievalMappings.add(retrievalMapping);
         		}
         	}
-        	addOrUpdateRetrievalMappings.add(retrievalMapping);
         });
         
         retrievalMappingFacade.saveOrUpdateBatch(addOrUpdateRetrievalMappings);     

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

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.diagbot.dto.FileDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
@@ -10,5 +11,5 @@ import java.util.Map;
  * @time: 2018/11/13 13:50
  */
 public interface UploadService {
-    Map<String, Object> singleFileUpload(MultipartFile file);
+    FileDTO singleFileUpload(MultipartFile file);
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -11,8 +12,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description: 文件上传服务接口实现
@@ -23,8 +22,9 @@ import java.util.Map;
 @Service
 public class UploadServiceImpl implements UploadService {
     @Override
-    public Map<String, Object> singleFileUpload(MultipartFile file) {
-        String path = "";
+    public FileDTO singleFileUpload(MultipartFile file) {
+        FileDTO fileDTO = new FileDTO();
+
         if (file.isEmpty()) {
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件不能为空");
         }
@@ -33,39 +33,22 @@ public class UploadServiceImpl implements UploadService {
             throw new CommonException(ServiceErrorCode.FILE_MAX_SIZE_LIMIT, "文件上传失败，超出大小限制1MB");
         }
         try {
-            // Get the file and save it somewhere
-            path = saveFile(file);
+            fileDTO = saveFile(file);
         } catch (Exception e) {
             log.error("文件上传失败", e);
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
         }
-        return resultMap("SUCCESS", path, file.getOriginalFilename(), file.getOriginalFilename());
+        return fileDTO;
     }
 
-    /**
-     * 上传文件返回格式
-     *
-     * @param state
-     * @param url
-     * @param title
-     * @param original
-     * @return
-     */
-    private Map<String, Object> resultMap(String state, String url, String title, String original) {
-        Map<String, Object> result = new HashMap<>();
-        result.put("state", state);
-        result.put("original", original);
-        result.put("title", title);
-        result.put("url", url);
-        return result;
-    }
 
     /**
      * @param multipartFile
      * @return
      * @throws IOException
      */
-    public String saveFile(MultipartFile multipartFile) 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);
@@ -89,7 +72,11 @@ public class UploadServiceImpl implements UploadService {
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
         }
         String path = "/" + fileAbsolutePath[0] + "/" + fileAbsolutePath[1];
-        return path;
+        fileDTO.setState("SUCCESS");
+        fileDTO.setUrl(path);
+        fileDTO.setOriginal(multipartFile.getOriginalFilename());
+        fileDTO.setTitle(multipartFile.getOriginalFilename());
+        return fileDTO;
 
     }
 

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

@@ -1,30 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotEmpty;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="根据映射关系删除标签的同义词接口传参")
-@Getter
-@Setter
-public class DelRetrievalsByMapsVO {
-	
-	/**
-	 * 标签同义词映射关系id集合
-	 */
-	@ApiModelProperty(value="标签同义词映射关系id集合",required=true)
-	@NotEmpty(message="标签同义词映射关系id必传")
-	private List<Long> retrievalMappingIds;
-
-
-}

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

@@ -0,0 +1,28 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:52
+ */
+@ApiModel(value="根据标签id删除标签的同义词接口传参")
+@Getter
+@Setter
+public class DelRetrievalsByQuesIdVO {
+	
+	/**
+     * 标签id
+     */
+	@ApiModelProperty(value="标签id",required=true)
+	@NotNull(message="标签id必传")
+    private Long questionId;
+	
+
+}

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

@@ -18,7 +18,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalListDTO;
 import com.diagbot.facade.RetrievalFacade;
 import com.diagbot.vo.AddTagRetrievalVO;
-import com.diagbot.vo.DelRetrievalsByMapsVO;
+import com.diagbot.vo.DelRetrievalsByQuesIdVO;
 import com.diagbot.vo.GetRetrievalsByTagVO;
 import com.diagbot.vo.RetrievalListVO;
 
@@ -49,13 +49,12 @@ public class RetrievalController {
         return RespDTO.onSuc(retrievalFacade.getRetrievalsByTag(getRetrievalsByTagVO));
     }
 
-
-    @ApiOperation(value = "根据映射关系删除标签的同义词[by:rengb]")
-    @PostMapping("/delRetrievalsByMaps")
-    @SysLogger("delRetrievalsByMaps")
+    @ApiOperation(value = "根据标签id删除标签的同义词[by:rengb]")
+    @PostMapping("/delRetrievalsByQuesId")
+    @SysLogger("delRetrievalsByQuesId")
     @Transactional
-    public RespDTO<List<Boolean>> delRetrievalsByMaps(@Valid @RequestBody DelRetrievalsByMapsVO delRetrievalsByMapsVO) {
-        return RespDTO.onSuc(retrievalFacade.delRetrievalsByMaps(delRetrievalsByMapsVO));
+    public RespDTO<Boolean> delRetrievalsByQuesId(@Valid @RequestBody DelRetrievalsByQuesIdVO delRetrievalsByQuesIdVO) {
+        return RespDTO.onSuc(retrievalFacade.delRetrievalsByQuesId(delRetrievalsByQuesIdVO));
     }
 
     @ApiOperation(value = "添加或者编辑标签同义词[by:rengb]")

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

@@ -1,5 +1,6 @@
 package com.diagbot.web;
 
+import com.diagbot.dto.FileDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.UploadFacade;
 import io.swagger.annotations.Api;
@@ -22,7 +23,7 @@ public class UploadController {
     private UploadFacade uploadFacade;
 
     @PostMapping("/uploadImage")
-    public RespDTO<Map<String, Object>> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
+    public RespDTO<FileDTO> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
         return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
     }
 

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

@@ -16,6 +16,7 @@
         <result column="label_suffix" property="labelSuffix" />
         <result column="order_no" property="orderNo" />
         <result column="default_select" property="defaultSelect" />
+        <result column="abnormal" property="abnormal" />
         <result column="code" property="code" />
         <result column="remark" property="remark" />
     </resultMap>

pom.xml

@@ -84,13 +84,6 @@
                 <version>${druid.version}</version>
             </dependency>
 
-            <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>1.2.46</version>
-            </dependency>
-
             <!--swagger-->
             <dependency>
                 <groupId>io.springfox</groupId>