Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizQuestionDTO.java

@@ -28,9 +28,6 @@ public class BizQuestionDTO extends BaseDTO  {
     @ApiModelProperty(value = "问题组id", position = 2)
     private String groupId;
 
-    @ApiModelProperty(value = "字段唯一标识", position = 3)
-    private String fieldKey;
-
     @ApiModelProperty(value = "字段名称", position = 4)
     private String fieldName;
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizQuestionPO.java

@@ -30,10 +30,6 @@ public class BizQuestionPO extends BasePO {
     @ApiModelProperty(value = "问题组id", position = 2)
     private String groupId;
 
-    /** 字段唯一标识 */
-    @ApiModelProperty(value = "字段唯一标识", position = 3)
-    private String fieldKey;
-
     /** 字段名称 */
     @ApiModelProperty(value = "字段名称", position = 4)
     private String fieldName;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.tr.module.smart.common.service.impl;
 
 import cn.tr.core.exception.TRExcCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
@@ -72,6 +73,7 @@ public class BizQuestionServiceImpl implements IBizQuestionService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean insertBizQuestion(BizQuestionDTO source){
+        validate(source);
         return baseRepository.insert(BizQuestionMapper.INSTANCE.convertPO(source))!=0;
     };
 
@@ -89,4 +91,16 @@ public class BizQuestionServiceImpl implements IBizQuestionService {
         }
         return baseRepository.deleteBatchIds(ids);
     };
+
+    private void validate(BizQuestionDTO source){
+        BizQuestionPO one = baseRepository.selectOne(new LambdaQueryWrapper<BizQuestionPO>()
+                .ne(StringUtils.isNotBlank(source.getId()),BizQuestionPO::getId, source.getId())
+                .eq(BizQuestionPO::getGroupId, source.getGroupId())
+                .nested(i->i.eq(BizQuestionPO::getFieldName,  source.getFieldName())
+                ).last("limit 1"));
+        if(one!=null){
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"该字段名称已存在");
+        }
+
+    }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/WxAppletUserController.java

@@ -72,4 +72,10 @@ public class WxAppletUserController {
     public CommonResult<List<BizWxUserBindHospitalVO>> allBindHospital(){
         return CommonResult.success( wxUserService.allBindHospital());
     }
+
+    @PostMapping("/preSurgeryQuestionnaire")
+    @ApiOperation(value = "术前问卷",position = 2)
+    public CommonResult<Boolean> preSurgeryQuestionnaire(@RequestBody Map<String,String> questionnaire){
+        return null;
+    }
 }

tr-test/src/main/java/cn/tr/test/WebApplication.java

@@ -1,5 +1,6 @@
 package cn.tr.test;
 
+import cn.dev33.satoken.strategy.SaStrategy;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -16,6 +17,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableAsync
 public class WebApplication {
     public static void main(String[] args) {
+
+        SaStrategy.me.checkElementAnnotation= t->{};
         SpringApplication.run(WebApplication.class);
     }
 }