add 药品新增拼音字段

nb-core/pom.xml

@@ -75,8 +75,12 @@
             <artifactId>easyexcel</artifactId>
         </dependency>
         <dependency>
-        <groupId>org.hibernate.validator</groupId>
-        <artifactId>hibernate-validator</artifactId>
-    </dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+        </dependency>
     </dependencies>
 </project>

nb-service-api/app-assistant-api/src/main/java/com/nb/app/assistant/api/feign/IAssistantUserBindClient.java

@@ -33,4 +33,13 @@ public interface IAssistantUserBindClient {
      */
     boolean handleBindResult(HandleBindResult source);
 
+    /**
+     * 描述: 与病人解除绑定关系
+     * @author lifang
+     * @date 2022/8/18 14:03
+     * @param bindId
+     * @param valueOf
+     * @return boolean
+     */
+    boolean liftBind(String bindId, String valueOf);
 }

nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserBindService.java

@@ -149,6 +149,20 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
         );
     }
 
+    @Override
+    public boolean liftBind(String bindId, String doctorId) {
+        boolean result = this
+                .update(new UpdateWrapper<AssistantUserBindEntity>()
+                        .lambda()
+                        .eq(AssistantUserBindEntity::getId, bindId)
+                        .eq(AssistantUserBindEntity::getDoctorId, doctorId)
+                        .set(AssistantUserBindEntity::getStatus, BindEnum.MANUAL_LIFTED));
+        if (result) {
+            //todo 发送断开消息
+        }
+        return result;
+    }
+
     /**
      * 描述:查询当前用户所看护的所有病人信息
      * @author lifang

nb-service/app-doctor/src/main/java/com/nb/app/doctor/controller/PatientMonitorController.java

@@ -2,6 +2,7 @@ package com.nb.app.doctor.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.hutool.json.JSONUtil;
 import com.nb.app.assistant.api.bean.HandleBindResult;
 import com.nb.app.assistant.api.entity.AssistantUserBindEntity;
@@ -97,10 +98,9 @@ public class PatientMonitorController {
     }
 
 
-    @PostMapping("/lift")
+    @PostMapping("/lift/{bindId}")
     @ApiOperation(value = "与病人解除绑定")
-    public R list() {
-        //todo
-        return R.success();
+    public R<Boolean> list(@PathVariable("bindId") String bindId) {
+        return R.success(userBindClient.liftBind(bindId,String.valueOf(SecurityUtil.getId())));
     }
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/entity/BusDrugEntity.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.bus.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.nb.core.entity.TenantGenericEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +28,10 @@ public class BusDrugEntity extends TenantGenericEntity<String,String> {
     @Length(max = 255,message = "药品名称长度不得超过255个字节")
     private String name;
 
+    @ApiModelProperty(value = "药品名称拼音",readOnly = true)
+    @JsonIgnoreProperties(allowGetters = true)
+    private String pinyin;
+
     @ApiModelProperty(value = "药品类型")
     @Length(max = 255,message = "药品类型不得超过255个字符")
     private String type;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDrugService.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.bus.service;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nb.web.service.bus.entity.BusDrugEntity;
 import com.nb.web.service.bus.mapper.BusDrugMapper;
@@ -27,6 +28,7 @@ public class LocalBusDrugService extends BaseService<BusDrugMapper, BusDrugEntit
         if(drug!=null){
             throw new CustomException("药品已存在，请勿重复添加");
         }
+        setPinYin(entity);
     }
 
     @Override
@@ -39,10 +41,22 @@ public class LocalBusDrugService extends BaseService<BusDrugMapper, BusDrugEntit
         if(drug!=null){
             throw new CustomException("药品已存在，请勿重复添加");
         }
+        setPinYin(entity);
     }
 
     @Override
     public void validateBeforeDelete(String id) {
 
     }
+
+
+    private void setPinYin(BusDrugEntity entity){
+        if(StrUtil.isNotEmpty(entity.getName())){
+            try {
+                entity.setPinyin(PinyinUtil.getPinyin(entity.getName()));
+            }catch (Exception e){
+                entity.setPinyin("#");
+            }
+        }
+    }
 }

pom.xml

@@ -20,6 +20,7 @@
         <versions-maven-plugin.version>2.7</versions-maven-plugin.version>
         <skipTests>true</skipTests>
         <hutool.version>5.7.21</hutool.version>
+        <pinyin.verison>2.5.1</pinyin.verison>
         <guava.version>30.1.1-jre</guava.version>
         <druid.version>1.2.8</druid.version>
         <spring-boot.version>2.5.8</spring-boot.version>
@@ -337,7 +338,11 @@
                 <artifactId>qpid-jms-client</artifactId>
                 <version>${jms.verison}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.belerweb</groupId>
+                <artifactId>pinyin4j</artifactId>
+                <version>${pinyin.verison}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>