修改外部接口

acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java

@@ -66,7 +66,7 @@ public class TaskController {
 
     @ApiOperation("定时任务添加随访工单")
     @PostMapping("/task")
-    @Scheduled(fixedRate = 10000)
+    @Scheduled(cron = "0 0 0 * * ?")
     @Anonymous
     public void task() {
         // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7  + 轮次时间）   到 （患者的出院时间 + 7  + 轮次时间  ）

acupuncture-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,71 @@
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.0.192:3306/acupuncture?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                username: root
+                password: csylcx18aA
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: jdbc:mysql://localhost:3306/acupuncture_yfyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: po3OynBO[M3579p6L7)o
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: acupuncture
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+
+file:
+    PatientTemplate: /home/acupuncture/server/profile/PatientTemplate.xlsx
+    TreamentTemplate: /home/acupuncture/server/profile/TreamentTemplate.xlsx
+    wxQrCodeTemplate: /home/acupuncture/server/profile/wxQrCodeTemplate.docx
+    screenQrCodeTemplate: /home/acupuncture/server/profile/screenQrCodeTemplate.docx
+    hbTemplate: /home/acupuncture/server/profile/screenHbQrCodeTemplate.docx
+    screenPath: http://test.tall.wiki/acupuncture/web-admin/screening/H5?hospitalId=hosId&hospitalName=hosName&centerId=cId
+    pgTemplate: /home/acupuncture/server/profile/TreamtmentPgTemplate.docx
+    jmrsUrl: /home/acupuncture/server/profile/uploads/jmrsTemplate.docx

acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java

@@ -62,7 +62,7 @@ public class WebDmsLoginService
     public String login(String username, String password, String code, String uuid)
     {
         // 验证码校验
-//        validateCaptcha(username, code, uuid);
+        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证

acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/ExternalDao.java

@@ -5,6 +5,8 @@ import com.acupuncture.system.domain.vo.DmsLoginUserVo;
 import com.acupuncture.system.domain.vo.ExternalVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @Author zzc
  * @Package com.acupuncture.system.persist.dao
@@ -13,5 +15,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ExternalDao {
 
-    ExternalVo.Result select(@Param("query") ExternalDto.Query query);
+    List<ExternalVo.Result> select(@Param("query") ExternalDto.Query query);
 }

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java

@@ -44,7 +44,11 @@ public class ExternalServiceImpl implements ExternalService {
         ExternalDto.Query query = new ExternalDto.Query();
         query.setFrom(from);
         query.setMemberid(memberid);
-        return externalDao.select(query);
+        List<ExternalVo.Result> select = externalDao.select(query);
+        if (CollectionUtil.isNotEmpty(select)) {
+            return select.get(0);
+        }
+        return new ExternalVo.Result();
     }
 
     @Override
@@ -139,6 +143,12 @@ public class ExternalServiceImpl implements ExternalService {
         uplRtcfInfos.setBmiMax(rtcfInfoDto.getBMIMax());
         uplRtcfInfos.setBmiMin(rtcfInfoDto.getBMIMin());
 
+        UplRtcfInfoExample uplRtcfInfoExample = new UplRtcfInfoExample();
+        uplRtcfInfoExample.createCriteria().andUuidEqualTo(rtcfInfoDto.getUUID()).andMemberidEqualTo(rtcfInfoDto.getMemberid()).andDelFlagEqualTo((byte) 0);
+        UplRtcfInfo uplRtcfInfo = new UplRtcfInfo();
+        uplRtcfInfo.setDelFlag((byte) 1);
+        uplRtcfInfoMapper.updateByExampleSelective(uplRtcfInfo, uplRtcfInfoExample);
+
         int insert = uplRtcfInfoMapper.insert(uplRtcfInfos);
         if (insert > 0) {
             redisCache.set("rtcfInfo:" + uplRtcfInfos.getMemberid(), uplRtcfInfos.getUuid());