m

src/main/java/com/yixin/ms/model/vo/HealtCodeUserVO.java

@@ -75,5 +75,16 @@ public class HealtCodeUserVO {
 
     @ApiModelProperty("通行语音播报提示语")
     private String openVoiceMsg;
+
+    /**
+     * ------ 账户添加配置信息2023-04-13 ------
+     **/
+    @ApiModelProperty("二维码是否显示 true/false")
+    private Boolean showQrcode = false;
+    @ApiModelProperty(value = "二维码的码值")
+    private String qrcodeText;
+    @ApiModelProperty(value = "广告图片的地址 ")
+    private String advertise;
+    
 }
 

src/main/java/com/yixin/ms/server/vo/PlaceInfoVO.java

@@ -44,5 +44,23 @@ public class PlaceInfoVO {
     @ApiModelProperty("考试设备集合 多个逗号,隔开")
     private String examDevices;
 
+    /**
+     * 是否报警 true/false
+     */
+    @ApiModelProperty("是否报警 true/false")
+    private Boolean isAlarm = false;
+    @ApiModelProperty(value = "场所类型，0：通用场所，1：预约场所 2:楼宇场景")
+    private Integer placeType;
+
+    /**
+     * ------ 账户添加配置信息2023-04-13 ------
+     **/
+    @ApiModelProperty("二维码是否显示 true/false")
+    private Boolean showQrcode = false;
+    @ApiModelProperty(value = "二维码的码值")
+    private String qrcodeText;
+    @ApiModelProperty(value = "广告图片的地址 ")
+    private String advertise;
+
 
 }

src/main/java/com/yixin/ms/service/impl/HealthCodeServiceImpl.java

@@ -181,6 +181,9 @@ public class HealthCodeServiceImpl implements HealthCodeService {
         userVO.setShowIdNumber(StrUtil.isEmpty(shortTermDTO.getIdNumber()) ? StrUtil.EMPTY : DesensitizedUtil.idCardNum(shortTermDTO.getIdNumber(), 4, 4));
         userVO.setUsername(StrUtil.isEmpty(shortTermDTO.getName()) ? StrUtil.EMPTY : shortTermDTO.getName());
         userVO.setShowUsername(StrUtil.isEmpty(shortTermDTO.getName()) ? StrUtil.EMPTY : DesensitizedUtil.chineseName(shortTermDTO.getName()));
+        userVO.setShowQrcode(placeInfoVO.getShowQrcode());
+        userVO.setAdvertise(placeInfoVO.getAdvertise());
+        userVO.setQrcodeText(placeInfoVO.getQrcodeText());
         //查询
         RestResult<QueryExamUserWhitelistVO> result = placeHealthCodeServer.getExamUserWhitelist(shortTermDTO.getSn(), shortTermDTO.getIdNumber());
         initExamHealthInfo(userVO, placeInfoVO, result, shortTermDTO.getSn());
@@ -295,6 +298,10 @@ public class HealthCodeServiceImpl implements HealthCodeService {
     }
 
     private void initHealthInfo(HealtCodeUserVO userVO, PlaceInfoVO placeInfoVO, JiliangCanPassVO jiliangCanPassVO) {
+        userVO.setShowQrcode(placeInfoVO.getShowQrcode());
+        userVO.setAdvertise(placeInfoVO.getAdvertise());
+        userVO.setQrcodeText(placeInfoVO.getQrcodeText());
+
         Integer isOpen = HealthOpenEnum.RELEASE.getCode();
         String codeTypeVOContent = "请通行";
         String iconUrl = "https://noise.hz-hanghui.com:8088/yx-fyzd/file/icon/nucleic/green_tick.png";