Merge branch 'dev/icss' into debug

icssman-service/src/main/java/com/diagbot/entity/wrapper/QuestionUsualWapper.java

@@ -0,0 +1,25 @@
+package com.diagbot.entity.wrapper;
+
+import com.diagbot.vo.QuestionUsualVO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/13 16:24
+ */
+@Getter
+@Setter
+public class QuestionUsualWapper extends QuestionUsualVO {
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+}

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

@@ -1,6 +1,8 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.entity.QuestionUsual;
+import com.diagbot.entity.wrapper.QuestionUsualWapper;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.UsualEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -9,9 +11,9 @@ import com.diagbot.service.QuestionUsualService;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.QuestionUsualVO;
-import com.diagbot.vo.UpdateQuetionUsualVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -40,9 +42,19 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean addQuestionUsual(QuestionUsualVO questionUsualVO) {
-        List<QuestionUsual> questionUsualList = Lists.newArrayList();
+        List<QuestionUsual> addList = Lists.newArrayList();
+        //判断该科室是否添加过常用标签
         QuestionUsual questionUsual = new QuestionUsual();
         String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        QuestionUsualWapper questionUsualWapper = new QuestionUsualWapper();
+        List<QuestionUsual> questionUsualList = this.getQuestionUsualByQuestionId(questionUsualVO);
+        if(ListUtil.isNotEmpty(questionUsualList)){
+            questionUsual = new QuestionUsual();
+            BeanUtil.copyProperties(questionUsualVO,questionUsualWapper);
+            questionUsualWapper.setModifier(userId);
+            questionUsualWapper.setGmtModified(DateUtil.now());
+            this.updateQuestionUsualByQuestionId(questionUsualWapper);
+        }
         for (int i = 0; i<questionUsualVO.getQuestionId().size(); i++ ) {
             questionUsual = new QuestionUsual();
             questionUsual.setCreator(userId);
@@ -53,51 +65,28 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             questionUsual.setDeptId(questionUsualVO.getDeptId());
             questionUsual.setOrderNo(Long.parseLong(String.valueOf(i+1)));
             questionUsual.setUsual(String.valueOf(UsualEnum.Enable.getKey()));
-            questionUsualList.add(questionUsual);
+            addList.add(questionUsual);
         }
-        Boolean flag = questionUsualService.saveBatch(questionUsualList);
+        Boolean flag = questionUsualService.saveBatch(addList);
         if(!flag){
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED,
                     "常用症状添加失败");
         }
-        return flag;
-    }
-
-    /**
-     * 修改常用标签
-     * @param updateQuetionUsualVO
-     * @return
-     */
-    public Boolean updateQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
-        QuestionUsual questionUsual = new QuestionUsual();
-        BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
-        questionUsual.setGmtModified(DateUtil.now());
-        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
-        Boolean flag = this.updateById(questionUsual);
-        if(!flag){
-            throw new CommonException(CommonErrorCode.FAIL,
-                    "常用症状修改失败");
-        }
-        return flag;
+        return true;
     }
 
     /**
      * 删除常用标签
-     * @param updateQuetionUsualVO
+     * @param deleteQuestionUsualVO
      * @return
      */
-    public Boolean deleteQuestionUsual(UpdateQuetionUsualVO updateQuetionUsualVO){
-        QuestionUsual questionUsual = new QuestionUsual();
-        BeanUtil.copyProperties(updateQuetionUsualVO,questionUsual);
-        questionUsual.setIsDeleted(IsDeleteEnum.Y.getKey());
-        questionUsual.setGmtModified(DateUtil.now());
-        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
-        Boolean flag = this.updateById(questionUsual);
-        if(!flag){
-            throw new CommonException(CommonErrorCode.FAIL,
-                    "常用症状删除失败");
-        }
-        return flag;
+    public Boolean deleteQuestionUsualByDeptId(DeleteQuestionUsualVO deleteQuestionUsualVO){
+        String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        UpdateWrapper<QuestionUsual> queryWrapper = new UpdateWrapper<>();
+        queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId()).set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", userId)
+                .set("gmt_modified", DateUtil.now());
+        this.update(new QuestionUsual(),queryWrapper);
+        return true;
     }
-
 }

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

@@ -1,7 +1,13 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.QuestionUsual;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.QuestionUsual;
+import com.diagbot.entity.wrapper.QuestionUsualWapper;
+import com.diagbot.entity.wrapper.QuestionWrapper;
+import com.diagbot.vo.QuestionUsualVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +18,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-12-03
  */
 public interface QuestionUsualMapper extends BaseMapper<QuestionUsual> {
+    /**
+     * 根据标签id获取常用标签信息
+     * @param questionUsualVO
+     * @return
+     */
+    public List<QuestionUsual> getQuestionUsualByQuestionId(@Param("questionUsualVO") QuestionUsualVO questionUsualVO);
 
+    /**
+     * 根据标签id删除常用标签信息
+     * @param questionUsualWapper
+     * @return
+     */
+    public int updateQuestionUsualByQuestionId(@Param("questionUsualWapper") QuestionUsualWapper questionUsualWapper);
 }

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

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.QuestionUsual;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.QuestionUsual;
+import com.diagbot.entity.wrapper.QuestionUsualWapper;
+import com.diagbot.vo.QuestionUsualVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface QuestionUsualService extends IService<QuestionUsual> {
 
+    /**
+     * 根据标签id获取常用标签信息
+     * @param questionUsualVO
+     * @return
+     */
+    public List<QuestionUsual> getQuestionUsualByQuestionId(QuestionUsualVO questionUsualVO);
+
+    /**
+     * 根据标签id删除常用标签信息
+     * @param questionUsualWapper
+     * @return
+     */
+    public Boolean updateQuestionUsualByQuestionId( QuestionUsualWapper questionUsualWapper);
 }

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

@@ -2,11 +2,13 @@ package com.diagbot.service;
 
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * @Description: 文件上传服务接口
  * @author: gaodm
  * @time: 2018/11/13 13:50
  */
 public interface UploadService {
-    String singleFileUpload(MultipartFile file);
+    Map<String,Object> singleFileUpload(MultipartFile file);
 }

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

@@ -1,11 +1,15 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.QuestionUsual;
+import com.diagbot.entity.wrapper.QuestionUsualWapper;
 import com.diagbot.mapper.QuestionUsualMapper;
 import com.diagbot.service.QuestionUsualService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.QuestionUsualVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 常用标签表 服务实现类
@@ -17,4 +21,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class QuestionUsualServiceImpl extends ServiceImpl<QuestionUsualMapper, QuestionUsual> implements QuestionUsualService {
 
+    @Override
+    public Boolean updateQuestionUsualByQuestionId(QuestionUsualWapper questionUsualWapper) {
+        return baseMapper.updateQuestionUsualByQuestionId(questionUsualWapper)>0?true:false;
+    }
+
+    @Override
+    public List<QuestionUsual> getQuestionUsualByQuestionId(QuestionUsualVO questionUsualVO) {
+        return baseMapper.getQuestionUsualByQuestionId(questionUsualVO);
+    }
 }

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

@@ -11,6 +11,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Description: 文件上传服务接口实现
@@ -21,7 +23,7 @@ import java.io.InputStream;
 @Service
 public class UploadServiceImpl implements UploadService {
     @Override
-    public String singleFileUpload(MultipartFile file) {
+    public Map<String,Object> singleFileUpload(MultipartFile file) {
         String path = "";
         if (file.isEmpty()) {
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件不能为空");
@@ -37,7 +39,24 @@ public class UploadServiceImpl implements UploadService {
             log.error("文件上传失败", e);
             throw new CommonException(ServiceErrorCode.FILE_UPLOAD_ERROE, "文件上传失败，请重新上传");
         }
-        return path;
+        return resultMap("SUCCESS", path, file.getOriginalFilename(), file.getOriginalFilename());
+    }
+
+    /**
+     * 上传文件返回格式
+     * @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;
     }
 
     /**

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

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/12/13 17:17
+ */
+@Setter
+@Getter
+public class DeleteQuestionUsualVO {
+    private Long deptId;
+}

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

@@ -8,10 +8,10 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DeptInfoFacade;
 import com.diagbot.facade.QuestionInfoFacade;
 import com.diagbot.facade.QuestionUsualFacade;
+import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.GetQuestionInfoVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionUsualVO;
-import com.diagbot.vo.UpdateQuetionUsualVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +45,7 @@ public class QuestionUsualController {
     @Autowired
     private QuestionInfoFacade questionInfoFacade;
 
-    @ApiOperation(value = "常用标签维护——添加[by:wangyu]",
+    @ApiOperation(value = "常用标签维护——添加和修改[by:wangyu]",
             notes = "deptCode: 科室编号,必填<br>" +
                     "hospitalCode: 医院编号，必填<br>" +
                     "questionName: 症状名称，必填")
@@ -57,25 +57,13 @@ public class QuestionUsualController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "常用标签维护——修改[by:wangyu]",
-            notes = "id: 常用标签id,必填<br>" +
-                    "orderNo: 排序号<br>" +
-                    "")
-    @PostMapping("/updateQuestionUsual")
-    @SysLogger("updateQuestionUsual")
-    @Transactional
-    public RespDTO<Boolean> updateQuestionUsual(@Valid @RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
-        Boolean data = questionUsualFacade.updateQuestionUsual(updateQuetionUsualVO);
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "常用标签维护——删除[by:wangyu]",
             notes = "id: 常用标签id,必填<br>")
     @PostMapping("/deleteQuestionUsual")
     @SysLogger("deleteQuestionUsual")
     @Transactional
-    public RespDTO<Boolean> deleteQuestionUsual(@Valid @RequestBody UpdateQuetionUsualVO updateQuetionUsualVO) {
-        Boolean data = questionUsualFacade.deleteQuestionUsual(updateQuetionUsualVO);
+    public RespDTO<Boolean> deleteQuestionUsual(@Valid @RequestBody DeleteQuestionUsualVO deleteQuestionUsualVO) {
+        Boolean data = questionUsualFacade.deleteQuestionUsualByDeptId(deleteQuestionUsualVO);
         return RespDTO.onSuc(data);
     }
 
@@ -98,7 +86,7 @@ public class QuestionUsualController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "常用标签维护——根据科室获取常用标签信息(修改用)[by:wangyu]",
+    @ApiOperation(value = "常用标签维护——根据科室获取常用标签信息(修改和详情用)[by:wangyu]",
             notes = "deptId: 科室id,必填<br>")
     @PostMapping("/getQuestionUsualByDept")
     @SysLogger("getQuestionUsualByDept")

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

@@ -6,23 +6,28 @@ import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @Api(value = "文件上传API", tags = { "文件上传API" })
-@RequestMapping("/file")
+@RequestMapping(value = "/file",method = RequestMethod.GET)
 @SuppressWarnings("unchecked")
 public class UploadController {
     @Autowired
     private UploadFacade uploadFacade;
 
-    @PostMapping("/upload")
-    public RespDTO<String> singleFileUpload(@RequestParam("file") MultipartFile file) {
+    @PostMapping("/uploadImage")
+    public RespDTO<Map<String, Object>> singleFileUpload(@RequestParam("upfile") MultipartFile file) {
         return RespDTO.onSuc(uploadFacade.singleFileUpload(file));
     }
 
+
     @PostMapping("/deleteRemoteFile")
     public RespDTO<Boolean> deleteRemoteFile(@RequestParam("path") String path) {
         return RespDTO.onSuc(uploadFacade.deleteRemoteFile(path));

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

@@ -18,4 +18,17 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <select id="getQuestionUsualByQuestionId" resultType="com.diagbot.entity.QuestionUsual">
+        SELECT a.* FROM `icss_question_usual` a WHERE a.is_deleted = 'N' AND a.dept_id = #{questionUsualVO.deptId} AND a.question_id in
+        <foreach item="questionId" collection="questionUsualVO.questionId" open="(" separator="," close=")">
+            #{questionId}
+        </foreach>
+    </select>
+
+    <update id="updateQuestionUsualByQuestionId">
+        UPDATE `icss_question_usual` a SET a.is_deleted = 'Y',a.modifier = #{questionUsualWapper.modifier},a.gmt_modified = #{questionUsualWapper.gmtModified} WHERE a.dept_id = #{questionUsualWapper.deptId} AND a.question_id in
+        <foreach item="questionId" collection="questionUsualWapper.questionId" open="(" separator="," close=")">
+            #{questionId}
+        </foreach>
+    </update>
 </mapper>