Merge branch 'dev/20200513end_1.2.0' into debug

src/main/java/com/diagbot/config/CacheDeleteInit.java

@@ -0,0 +1,29 @@
+package com.diagbot.config;
+
+import com.diagbot.facade.CacheFacade;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 项目启动后初始化缓存
+ * @author: gaodm
+ * @time: 2020/5/13 11:20
+ */
+@Component //把类交给spring容器管理
+@Order(100)  //使用order属性，设置该类在spring容器中的加载顺序
+@Slf4j
+public class CacheDeleteInit implements CommandLineRunner {
+
+    @Autowired
+    CacheFacade cacheFacade;
+
+    @Override
+    public void run(String... args) throws Exception {
+        // 服务启动清除redis缓存
+        cacheFacade.clear();
+        log.info("病历质控系统缓存启动初始化成功！");
+    }
+}

src/main/java/com/diagbot/facade/ConsoleByDeptFacade.java

@@ -17,7 +17,12 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -431,4 +436,20 @@ public class ConsoleByDeptFacade {
             return null;
         }
     }
+
+    /**
+     * 获取关联科室
+     *
+     * @param
+     * @return
+     */
+    public List<DeptBaseDTO> getDept() {
+        FilterByDeptVO filterByDeptVO = new FilterByDeptVO();
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterByDeptVO.setHospitalId(hospitalId);
+        filterByDeptVO.setUserId(Long.valueOf(userId));
+        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterByDeptVO);
+        return deptList;
+    }
 }

src/main/java/com/diagbot/facade/QcModuleInfoFacade.java

@@ -17,6 +17,7 @@ import com.diagbot.vo.GetModuleInfoOneVO;
 import com.diagbot.vo.GetModuleMapVO;
 import com.diagbot.vo.QuestionIdsVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -81,7 +82,7 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
      * @param getModuleMapVO
      * @return
      */
-//    @Cacheable(value = "cache", key = "'qcmodule'")
+    @Cacheable(value = "cache", key = "'qcmodule'")
     public Map<Long, GetModuleInfoOneDTO> getModuleMap(GetModuleMapVO getModuleMapVO) {
         Map<Long, GetModuleInfoOneDTO> res = new LinkedHashMap<>();
         List<QcModuleInfo> qcModuleInfoList = this.list(new QueryWrapper<QcModuleInfo>()

src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptBaseDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConsoleByDeptFacade;
 import com.diagbot.vo.FilterByDeptVO;
@@ -12,6 +13,7 @@ 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;
 import java.util.Map;
 
 /**
@@ -62,4 +64,13 @@ public class ConsoleByDeptController {
         Map<String, Object> data = consoleByDeptFacade.entryCountGroupByEntryAndDept(filterByDeptVO);
         return RespDTO.onSuc(data);
     }
-}
+
+    @ApiOperation(value = "用户关联科室[by:zhaops]",
+            notes = "")
+    @PostMapping("/getDept")
+    @SysLogger("getDept")
+    public RespDTO<List<DeptBaseDTO>> getDept() {
+        List<DeptBaseDTO> data = consoleByDeptFacade.getDept();
+        return RespDTO.onSuc(data);
+    }
+}

src/main/java/com/diagbot/web/SysRoleController.java

@@ -48,7 +48,7 @@ public class SysRoleController {
     @PostMapping("/listForUser")
     @SysLogger("listForUser")
     public RespDTO<List<SysRoleDTO>> listForUser() {
-        return RespDTO.onSuc(sysRoleFacade.listForUser());
+        return RespDTO.onSuc(sysRoleFacade.listFac());
     }
 
     @ApiOperation(value = "获取角色菜权限单等数据[by:gaodm]",

src/main/resources/mapper/SysUserMapper.xml

@@ -96,6 +96,7 @@
                 t8.is_deleted = 'N'
                 AND t9.is_deleted = 'N'
                 AND t8.role_id = t9.id
+                AND t8.role_id ！= -1
                 AND t8.role_id = #{roleId}
                 GROUP BY
                 t8.user_id
@@ -112,6 +113,7 @@
                 WHERE
                 t8.is_deleted = 'N'
                 AND t9.is_deleted = 'N'
+                AND t8.role_id ！= -1
                 AND t8.role_id = t9.id
                 GROUP BY
                 t8.user_id