日志捕捉/字典组织获取

common/src/main/java/com/lantone/common/dto/GetRealHospitalDTO.java

@@ -0,0 +1,19 @@
+package com.lantone.common.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: cy
+ * @time: 2021/11/9 14:28
+ */
+@Data
+public class GetRealHospitalDTO {
+
+    @ApiModelProperty(value = "编号")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "名称")
+    private String hospitalName;
+}

common/src/main/java/com/lantone/common/vo/SaveDictionaryVO.java

@@ -24,7 +24,7 @@ public class SaveDictionaryVO implements Serializable {
 
     @ApiModelProperty(value = "代码类别",required = true)
     @NotNull(message = "代码类别不能为空")
-    private Long groupType;
+    private String groupType;
 
     @ApiModelProperty(value = "代码名称",required = true)
     @NotBlank(message = "代码名称不能为空")

common/src/main/java/com/lantone/common/vo/SaveHospitalSetVO.java

@@ -2,6 +2,7 @@ package com.lantone.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -22,7 +23,7 @@ public class SaveHospitalSetVO implements Serializable {
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "医院id",hidden = true)
+    @ApiModelProperty(value = "医院id")
     private Long hospitalId;
 
     /**
@@ -58,6 +59,10 @@ public class SaveHospitalSetVO implements Serializable {
     @NotBlank(message = "参数值不能为空")
     private String val;
 
+    @ApiModelProperty(value = "是否启用(0-否 1-是)",required = true)
+    @NotNull(message = "是否启用不能为空")
+    private String status;
+
     /**
      * 备注
      */

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalSet.java

@@ -58,6 +58,12 @@ public class HospitalSet implements Serializable {
     @TableField("val")
     private String val;
 
+    /**
+     * 状态 0：禁用，1：启用
+     */
+    @TableField("status")
+    private String status;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

dblayer-mbg/src/main/resources/mapper/base/BaseHospitalSetMapper.xml

@@ -10,6 +10,7 @@
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="val" property="val"/>
+        <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

security-center/src/main/java/com/lantone/security/aop/LogAspect.java

@@ -41,10 +41,12 @@ public class LogAspect {
      "||execution(public * com.lantone.security.web.HospitalManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.HospitalSetManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.LogManagementController.*(..))" +
-     "&& !execution(public * com.lantone.security.web.LogManagementController.getOperationLog(..)) "+
+     "&& !execution(public * com.lantone.security.web.LogManagementController.getOperationLog(..))"+
      "||execution(public * com.lantone.security.web.RegionManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.RoleManagementController.*(..))"+
-     "||execution(public * com.lantone.security.web.UserManagementController.*(..))"
+     "||execution(public * com.lantone.security.web.UserManagementController.*(..))"+
+     "&& !execution(public * com.lantone.security.web.UserManagementController.login(..))"+
+     "&& !execution(public * com.lantone.security.web.UserManagementController.loadUserByUsername(..))"
     )
     public void operPointCut() {
     }

security-center/src/main/java/com/lantone/security/facade/HospitalSetManagementFacade.java

@@ -2,17 +2,23 @@ package com.lantone.security.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.lantone.common.dto.GetRealHospitalDTO;
 import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.enums.StatusEnum;
 import com.lantone.common.exception.ApiException;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.common.vo.GetHospitalSetVO;
 import com.lantone.common.vo.SaveHospitalSetVO;
+import com.lantone.dblayermbg.entity.Hospital;
 import com.lantone.dblayermbg.entity.HospitalSet;
+import com.lantone.dblayermbg.facade.HospitalFacade;
 import com.lantone.dblayermbg.facade.HospitalSetFacade;
+import com.lantone.security.enums.HospitalTypeEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -27,6 +33,9 @@ import java.util.stream.Collectors;
 public class HospitalSetManagementFacade {
     @Autowired
     private HospitalSetFacade hospitalSetFacade;
+    @Autowired
+    private HospitalFacade hospitalFacade;
+
 
     /**
      * @Description:  新增参数
@@ -82,6 +91,17 @@ public class HospitalSetManagementFacade {
         hospitalSetLambdaQuery.eq(null != getHospitalSetVO.getId(),HospitalSet::getId, getHospitalSetVO.getId());
         hospitalSetLambdaQuery.orderByDesc(HospitalSet::getGmtCreate);
         IPage<HospitalSet> page = hospitalSetLambdaQuery.page(pageInfo);
+        page.getRecords().forEach(kfc -> {
+            if (StringUtil.isNotBlank(kfc.getStatus())) {
+                if (kfc.getStatus().equals(StatusEnum.Enable.getKey())) {
+                    kfc.setStatus("启用");
+                }
+                if (kfc.getStatus().equals(StatusEnum.Disable.getKey())) {
+                    kfc.setStatus("禁用");
+                }
+            }
+        });
+        page.setRecords(page.getRecords());
         return page;
     }
 
@@ -108,7 +128,6 @@ public class HospitalSetManagementFacade {
      * @Date: 2021/7/30
      */
     public void checkHospitalSet(SaveHospitalSetVO saveHospitalSetVO) {
-        saveHospitalSetVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
         saveHospitalSetVO.setUserId(SysUserUtils.getCurrentPrincipleId());
         if (null == saveHospitalSetVO.getId()) {
             Integer count = hospitalSetFacade.lambdaQuery()
@@ -157,13 +176,21 @@ public class HospitalSetManagementFacade {
      * @Author: cy
      * @Date: 2021/8/9
      */
-    public List<String> getHospitalNames(String hospitalName) {
-        LambdaQueryChainWrapper<HospitalSet> hospitalSetLambdaQuery = hospitalSetFacade.lambdaQuery();
+    public List<GetRealHospitalDTO> getHospitalNames(String hospitalName) {
+        List<GetRealHospitalDTO> getRealHospitalDTOS = new ArrayList<>();
+        LambdaQueryChainWrapper<Hospital> hospitalSetLambdaQuery = hospitalFacade.lambdaQuery();
         if(StringUtil.isNotBlank(hospitalName)){
-            hospitalSetLambdaQuery.like(HospitalSet::getHospitalName,hospitalName);
+            hospitalSetLambdaQuery.like(Hospital::getName,hospitalName);
         }
-        hospitalSetLambdaQuery.eq(HospitalSet::getIsDeleted, IsDeleteEnum.N.getKey());
-        hospitalSetLambdaQuery.groupBy(HospitalSet::getHospitalName);
-        return  hospitalSetLambdaQuery.list().stream().filter(obj -> StringUtil.isNotBlank(obj.getHospitalName())).sorted(Comparator.comparing(HospitalSet::getHospitalId)).map(obj -> obj.getHospitalName()).collect(Collectors.toList());
+        hospitalSetLambdaQuery.eq(Hospital::getIsDeleted, IsDeleteEnum.N.getKey());
+        hospitalSetLambdaQuery.eq(Hospital::getType, HospitalTypeEnum.SINGLE_HOSPITAL.getKey());
+        List<Hospital> hspitals = hospitalSetLambdaQuery.list().stream().filter(obj -> StringUtil.isNotBlank(obj.getName())).sorted(Comparator.comparing(Hospital::getId)).collect(Collectors.toList());
+        hspitals.forEach(kfc->{
+            GetRealHospitalDTO getRealHospitalDTO = new GetRealHospitalDTO();
+            getRealHospitalDTO.setHospitalId(kfc.getId());
+            getRealHospitalDTO.setHospitalName(kfc.getName());
+            getRealHospitalDTOS.add(getRealHospitalDTO);
+        });
+        return getRealHospitalDTOS;
     }
 }

security-center/src/main/java/com/lantone/security/web/HospitalSetManagementController.java

@@ -2,6 +2,7 @@ package com.lantone.security.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.GetRealHospitalDTO;
 import com.lantone.common.vo.GetHospitalSetVO;
 import com.lantone.common.vo.SaveHospitalSetVO;
 import com.lantone.dblayermbg.entity.HospitalSet;
@@ -61,7 +62,7 @@ public class HospitalSetManagementController {
 
     @ApiOperation(value = "查看参数管理所属组织[by:cy]")
     @PostMapping("/getHospitalNames")
-    public CommonResult<List<String>> getHospitalNames(@RequestParam("hospitalName") String hospitalName) {
+    public CommonResult<List<GetRealHospitalDTO>> getHospitalNames(@RequestParam("hospitalName") String hospitalName) {
         return CommonResult.success(hospitalSetManagementFacade.getHospitalNames(hospitalName));
     }
 }