1

hjzx-api/pom.xml

@@ -67,11 +67,14 @@
             <artifactId>druid</artifactId>
             <version>1.1.22</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.apache.shardingsphere</groupId>-->
-<!--            <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>-->
-<!--            <version>5.1.1</version>-->
-<!--        </dependency>-->
+        <!-- 如果需要解码播放mp3文件则引入这个jar包 -->
+        <dependency>
+            <groupId>com.googlecode.soundlibs</groupId>
+            <artifactId>mp3spi</artifactId>
+            <version>1.9.5.4</version>
+        </dependency>
+
+
 
     </dependencies>
 

hjzx-api/src/main/java/api/controller/HomeController.java

@@ -19,18 +19,21 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
+import javax.sound.sampled.*;
+import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
 
+
 @Api(value = "默认", tags = "默认")
 @Slf4j
 @Anonymous
@@ -51,6 +54,58 @@ public class HomeController extends BaseController {
 
     @Autowired
     private WebSocket webSocket;
+    @ApiOperation("GetViev")
+    @GetMapping("/GetViev")
+    public AjaxResult GetViev() {
+            Map<String,Object> map=new HashMap<>();
+               // 音频文件路径
+           String audioFilePath ="D:/6047871_2034_150732.mp3";
+  try
+  {
+      // FFmpeg命令：获取音频平均音量和音速
+     // String[] command = new String[]{"ffmpeg", "-i", audioFilePath, "-filter_complex", "volumedetect", "-f", "null", "NUL"};
+      String[] command = new String[]{"ffmpeg", "-i", audioFilePath, "-ss", "00:01:00", "-t", "00:02:00", "D:/6047871_2034_150732output.mp3"};
+      // 执行FFmpeg命令
+      ProcessBuilder builder = new ProcessBuilder(command);
+      builder.redirectErrorStream(true);
+      Process process = builder.start();
+      process.waitFor();
+      String[] command1 = new String[]{"ffmpeg", "-i", "D:/6047871_2034_150732output.mp3", "-filter_complex", "volumedetect", "-f", "null", "NUL"};
+      ProcessBuilder builder1 = new ProcessBuilder(command1);
+      builder1.redirectErrorStream(true);
+      Process process1 = builder1.start();
+      final InputStream inputStream = process1.getInputStream();
+      BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream,"GBK"));
+      String line;
+      while ((line = reader.readLine()) != null) {
+          if (line.contains("mean_volume")) {
+              map.put("平均音量",line.split(":")[1]);
+          } else  if (line.contains("max_volume")) {
+              map.put("最大音量",line.split(":")[1]);
+          }
+          else  if (line.contains("Stream #0:0")) {
+              String[] parts = line.split(",");
+              for (String part : parts) {
+                  if (part.contains("kb/s")) {
+                      // 这里假设音速是以kb/s为单位的
+                      String audioSpeed = part.trim();
+                      map.put("音速",audioSpeed);
+                  }
+              }
+          }
+      }
+      process1.waitFor();
+      reader.close();
+              } catch (Exception e) {
+      e.printStackTrace();
+               }
+
+
+        return Success("获取成功", map);
+    }
+
+
+
 
     @ApiOperation("Hello World")
     @GetMapping("/")

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -249,7 +249,7 @@ public class WorkOrderBaseController extends BaseController {
     @ApiOperation("新增")
     @Log(title = "新增wo_workorderbase", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody WorkOrderBase input, String callid) {
+    public AjaxResult add(@RequestBody WorkOrderBase input) {
 
         Date currentDate = new Date(System.currentTimeMillis());
         Random random = new Random();
@@ -282,10 +282,10 @@ public class WorkOrderBaseController extends BaseController {
         }
 
         boolean result = workorderbaseService.insert(input);
-        if (!StringHelper.isEmpty(callid)) {
+        if ( input.getCallId() !=null && input.getCallId()>0) {
 
             LambdaUpdateWrapper<CallLog> qw = new LambdaUpdateWrapper<>();
-            qw.eq(CallLog::getUuid, callid);
+            qw.eq(CallLog::getId, input.getCallId());
             qw.set(CallLog::getWorkordercode, ordercode);
             calllogService.updateBatch(qw);
         }

hjzx-api/src/main/java/api/controller/patient/PatientController.java

@@ -69,6 +69,7 @@ public class PatientController extends BaseController {
          qw.like(!StringHelper.isEmpty(input.getPatientStatus()), Patient::getPatientStatus, input.getPatientStatus());
         qw.eq( input.getPhoneStatus()!=null , Patient::getPhoneStatus, input.getPhoneStatus());
         qw.eq( input.getJzks()!=null&&input.getJzks()>0 , Patient::getJzks, input.getJzks());
+        qw.eq( input.getSex()!=null&&input.getSex()>0 , Patient::getSex, input.getSex());
         qw.eq( Patient::getIsDelete,0);
         qw.orderByDesc(Patient::getCreateTime);
         Page<Patient> page = GetPage(pageInput);

hjzx-api/src/main/java/api/controller/system/UserExtensionController.java

@@ -25,6 +25,7 @@ import api.util.enums.BusinessType;
 import api.util.helper.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.*;
@@ -149,21 +150,43 @@ public class UserExtensionController extends BaseController {
         {
             return Error("该用户不存在");
         }
+        LambdaQueryWrapper<UserExtension> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserExtension::getUsercode, input.getUsercode());
+        var Extension = userextensionService.getList(queryWrapper);
+
+
+        LambdaUpdateWrapper<UserExtension> update = new LambdaUpdateWrapper<>();
+        update.eq(UserExtension::getExtension, input.getExtension());
+        update.set(UserExtension::getExtension,"");//将之前该分机号下的用户置空
+        boolean result1 = userextensionService.updateBatch(update);
+
+        if(Extension!=null&&Extension.size()>0)
+        {  LambdaUpdateWrapper<UserExtension> updateqw = new LambdaUpdateWrapper<>();
+            updateqw.eq(UserExtension::getUsercode, input.getUsercode());
+            updateqw.set(UserExtension::getExtension, input.getExtension());
+            boolean result = userextensionService.updateBatch(updateqw);
+            //  boolean result = userextensionService.update(input);
+            if (result) {
+                return Success("成功");
+            } else {
+                return Error("修改失败");
+            }
+        }
+        else
+        {
+
+            boolean result = userextensionService.insert(input);
+            if (result) {
+                return Success("成功");
+            } else {
+                return Error("失败");
+            }
+        }
 
-        LambdaUpdateWrapper<UserExtension> updateqw = new LambdaUpdateWrapper<>();
-        updateqw.eq(UserExtension::getExtension, input.getExtension());
 
 
-        updateqw.set(UserExtension::getUsercode, input.getUsercode());
 
-        boolean result = userextensionService.updateBatch(updateqw);
 
-      //  boolean result = userextensionService.update(input);
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("修改失败");
-        }
     }
 
     @ApiOperation("删除")

hjzx-api/src/main/resources/application-production.yml

@@ -1,49 +1,74 @@
 server:
-  port: 8000
+  port: 8120
 swagger: false
+
 spring:
-  shardingsphere:
-    datasource:
-      names: master,slave0,slave1
-      master:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://10.160.153.119:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-        username: root
-        password: 123456
-      slave0:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://10.160.153.119:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-        username: root
-        password: 123456
-      slave1:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://10.160.153.119:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-        username: root
-        password: 123456
-    rules:
-      readwrite-splitting:
-        data-sources:
-          mds:
-            type: static
-            props:
-              write-data-source-name: master
-              read-data-source-names: slave0,slave1
-            load-balancer-name: read-random
-        load-balancers:
-          read-random:
-            type: round_robin
-    enabled: true
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/kf12356?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    username: kf12356
+    password: 30oBbf5rVhAc1xdk
+
+  #  shardingsphere:
+  #    datasource:
+  #      names: master,slave0,slave1
+  #      master:
+  #        type: com.alibaba.druid.pool.DruidDataSource
+  #        driver-class-name: com.mysql.cj.jdbc.Driver
+  #        url: jdbc:mysql://192.168.1.200:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+  #        username: root
+  #        password: 800100
+  #      slave0:
+  #        type: com.alibaba.druid.pool.DruidDataSource
+  #        driver-class-name: com.mysql.cj.jdbc.Driver
+  #        url: jdbc:mysql://192.168.1.200:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+  #        username: root
+  #        password: 800100
+  #      slave1:
+  #        type: com.alibaba.druid.pool.DruidDataSource
+  #        driver-class-name: com.mysql.cj.jdbc.Driver
+  #        url: jdbc:mysql://192.168.1.200:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+  #        username: root
+  #        password: 800100
+  #    rules:
+  #      readwrite-splitting:
+  #        data-sources:
+  #          mds:
+  #            type: static
+  #            props:
+  #              write-data-source-name: master
+  #              read-data-source-names: slave0,slave1
+  #            load-balancer-name: read-random
+  #        load-balancers:
+  #          read-random:
+  #            type: round_robin
+  #    enabled: true
+
   redis:
     # 地址
-    host: 10.160.153.119
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 1
+    database: 5
     # 密码
-    password:
+    password: d55s6fa8fe6fr
     # 连接超时时间
-    timeout: 10s
+    timeout: 10s
+
+  wechat:
+    # AppId: wx0d67bbb5666ec226
+    # AppSecret: abe7ea3ac71e42fa27ec564045b1387a
+    AppId: wxe8b06998505853d2
+    AppSecret: e3f24289c16dafcb26596e43ef21ccc2
+
+    Token: a3ac71e42f
+    EncodingAESKey: SnHmIXFhkuagAXcoAAEsgVnNiqFdn2TXkwT7Tm2MqkC
+
+  esclient:
+    host: 192.168.1.8
+    port: 9200
+    auth: false
+    username:
+    password:

hjzx-api/src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    #active: production
-    active: dev
+    active: production
+    #active: dev
   servlet:
     multipart:
       max-file-size: 20MB #单个文件最大为20M