server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -59,6 +59,11 @@ public static final String REQUEST_URL ="REQUEST_URL" ; public static final String LOCATION ="LOCATION" ; public static final String API_KEY ="API_KEY" ; public static final String CABINET_CONFIG ="CABINET_CONFIG" ; public static final String BLOW_TIME ="BLOW_TIME" ; public static final String PRESSURE ="PRESSURE" ; public static final String CONCENTRATION ="CONCENTRATION" ; public static final String THRESHOLD ="THRESHOLD" ; //被æ访人信æ¯æ ¡éªæ¹å¼ï¼0ææºå·åç¬æ ¡éª 1ææºå·åå§åç»åæ ¡éªï¼ public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID"; public static final String LW_BEVISITED_USER_VALID = "LW_BEVISITED_USER_VALID"; server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetCloudController.java
@@ -6,6 +6,7 @@ import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.JkCabinet; import com.doumee.dao.business.vo.CabinetConfigDataVO; import com.doumee.service.business.JkCabinetService; import com.doumee.service.business.third.model.ApiResponse; import com.doumee.service.business.third.model.PageData; @@ -95,4 +96,21 @@ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success(jkCabinetService.getDetail(id)); } @ApiOperation("æ´æ°é ç²¾æ£æµé ç½®") @PostMapping("/updateCabinetConfig") @CloudRequiredPermission("business:jkcabinet:update") public ApiResponse updateCabinetConfig(@RequestBody CabinetConfigDataVO cabinetConfigDataVO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { jkCabinetService.updCabinetConfig(cabinetConfigDataVO); return ApiResponse.success(null); } @ApiOperation("è·åé ç²¾æ£æµé ç½®") @GetMapping("/getCabinetConfig") @CloudRequiredPermission("business:jkcabinet:query") public ApiResponse<CabinetConfigDataVO> getCabinetConfig( @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { return ApiResponse.success(jkCabinetService.getCabinetConfigDataVO()); } } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetConfigDataVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,30 @@ package com.doumee.dao.business.vo; import com.doumee.dao.business.model.Approve; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * Created by IntelliJ IDEA. * * @Author : Rk * @create 2024/5/23 14:56 */ @Data public class CabinetConfigDataVO { @ApiModelProperty(value = "æµåº¦éå¼åä½ (1=mg/100ml;2=mg/L;3=%BAC)") private String threshold; @ApiModelProperty(value = "å¹æ°æ¶é¿ï¼ç§ï¼") private String blowTime; @ApiModelProperty(value = "ååå¼") private String pressure; @ApiModelProperty(value = "æµåº¦éå¼") private String concentration; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
@@ -1,5 +1,6 @@ package com.doumee.service.business; import com.doumee.dao.business.vo.CabinetConfigDataVO; import com.doumee.service.business.third.model.PageData; import com.doumee.service.business.third.model.PageWrap; import com.doumee.dao.business.model.JkCabinet; @@ -97,4 +98,8 @@ * @return long */ long count(JkCabinet jkCabinet); CabinetConfigDataVO getCabinetConfigDataVO(); void updCabinetConfig(CabinetConfigDataVO cabinetConfigDataVO); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -1,5 +1,6 @@ package com.doumee.service.business.impl; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.utils.Constants; @@ -8,6 +9,8 @@ import com.doumee.dao.business.JkKeysMapper; import com.doumee.dao.business.model.JkCabinetGrid; import com.doumee.dao.business.model.JkKeys; import com.doumee.dao.business.vo.CabinetConfigDataVO; import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.service.business.third.model.PageData; import com.doumee.service.business.third.model.PageWrap; @@ -45,6 +48,9 @@ @Autowired private JkKeysMapper jkKeysMapper; @Autowired private SystemDictDataBiz systemDictDataBiz; @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) @@ -292,8 +298,51 @@ @Override public CabinetConfigDataVO getCabinetConfigDataVO(){ CabinetConfigDataVO cabinetConfigDataVO = new CabinetConfigDataVO(); cabinetConfigDataVO.setConcentration(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.CONCENTRATION).getCode()); cabinetConfigDataVO.setPressure(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.PRESSURE).getCode()); cabinetConfigDataVO.setBlowTime(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.BLOW_TIME).getCode()); cabinetConfigDataVO.setThreshold(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.THRESHOLD).getCode()); return cabinetConfigDataVO; } @Override public void updCabinetConfig(CabinetConfigDataVO cabinetConfigDataVO){ if(Objects.isNull(cabinetConfigDataVO) || (StringUtils.isBlank(cabinetConfigDataVO.getBlowTime()) && StringUtils.isBlank(cabinetConfigDataVO.getConcentration()) && StringUtils.isBlank(cabinetConfigDataVO.getPressure()) && StringUtils.isBlank(cabinetConfigDataVO.getThreshold()) )){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(StringUtils.isNotBlank(cabinetConfigDataVO.getConcentration())){ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.CONCENTRATION); systemDictData.setCode(cabinetConfigDataVO.getConcentration()); systemDictDataBiz.updateByIdNew(systemDictData); } if(StringUtils.isNotBlank(cabinetConfigDataVO.getPressure())){ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.PRESSURE); systemDictData.setCode(cabinetConfigDataVO.getPressure()); systemDictDataBiz.updateByIdNew(systemDictData); } if(StringUtils.isNotBlank(cabinetConfigDataVO.getBlowTime())){ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.BLOW_TIME); systemDictData.setCode(cabinetConfigDataVO.getBlowTime()); systemDictDataBiz.updateByIdNew(systemDictData); } if(StringUtils.isNotBlank(cabinetConfigDataVO.getThreshold())){ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.THRESHOLD); systemDictData.setCode(cabinetConfigDataVO.getThreshold()); systemDictDataBiz.updateByIdNew(systemDictData); } } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
@@ -72,6 +72,7 @@ if(Constants.equalsInteger(jkIccard.getStatus(),Constants.ZERO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"å¯ç¨æ°æ®æ æ³è¿è¡å é¤ï¼"); } jkIccardMapper.update(null,new UpdateWrapper<JkIccard>().lambda().set(JkIccard::getIsdeleted,Constants.ONE).eq(JkIccard::getId,jkIccard.getId())); } @Override server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
@@ -48,7 +48,6 @@ @Override public Integer create(JkVersion jkVersion) { if(Objects.isNull(jkVersion) || Objects.isNull(jkVersion.getType()) || Objects.isNull(jkVersion.getIsForce()) || StringUtils.isBlank(jkVersion.getVersionInfo()) || StringUtils.isBlank(jkVersion.getFileUrl()) @@ -56,7 +55,7 @@ || StringUtils.isBlank(jkVersion.getName()) || StringUtils.isBlank(jkVersion.getContent()) ){ throw new BusinessException(ResponseStatus.NOT_ALLOWED); throw new BusinessException(ResponseStatus.BAD_REQUEST); } LoginUserInfo loginUserInfo = jkVersion.getLoginUserInfo(); jkVersion.setCreateDate(new Date()); @@ -64,6 +63,7 @@ jkVersion.setEditDate(jkVersion.getCreateDate()); jkVersion.setEditor(jkVersion.getCreator()); jkVersion.setIsdeleted(Constants.ZERO); jkVersion.setType(Constants.ZERO); jkVersionMapper.insert(jkVersion); return jkVersion.getId(); } @@ -94,7 +94,6 @@ public void updateById(JkVersion jkVersion) { if(Objects.isNull(jkVersion) || Objects.isNull(jkVersion.getId()) || Objects.isNull(jkVersion.getType()) || Objects.isNull(jkVersion.getIsForce()) || StringUtils.isBlank(jkVersion.getVersionInfo()) || StringUtils.isBlank(jkVersion.getFileUrl())
