server/dmvisit_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -58,13 +58,6 @@ @Override public void updateByIdNew(SystemDictData systemDictData) { SystemDictData queryDto = new SystemDictData(); queryDto.setId(systemDictData.getId()); queryDto.setCode(systemDictData.getCode()); SystemDictData dictData = systemDictDataService.findOne(queryDto); if (dictData != null && !dictData.getId().equals(systemDictData.getId())) { throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "数据值已存在"); } systemDictDataService.updateById(systemDictData); }
@@ -289,7 +289,7 @@ List<DeviceRole> deviceRoleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() .eq(DeviceRole::getType,type) .eq(DeviceRole::getIsdeleted, Constants.ZERO) .eq(DeviceRole::getStatus, Constants.ZERO) .eq(DeviceRole::getStatus, Constants.ONE) ); List<DeviceRoleVO> deviceRoleVOList = new ArrayList<>(); for (DeviceRole deviceRole:deviceRoleList) { server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -738,8 +738,9 @@ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>() .lambda().eq(Member::getIsdeleted,Constants.ZERO) .eq(Member::getType,Constants.memberType.internal) .eq(Member::getStatus,Constants.ZERO) .isNotNull(Member::getHkId) .notExists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ") .exists(" SELECT 1 FROM device_event b WHERE b.ext_event_person_no = HK_ID AND TO_DAYS( NOW()) - TO_DAYS( b.CREATE_DATE ) > "+systemDictData.getCode()+" ") ); if(CollectionUtils.isEmpty(memberList)){ return; @@ -749,6 +750,7 @@ //冻结状态 memberMapper.update(null,new UpdateWrapper<Member>() .lambda().set(Member::getStatus,Constants.TWO) .set(Member::getEditDate,new Date()) .in(Member::getId,memberIds) ); //处理下发数据 @@ -810,7 +812,11 @@ .last(" limit 1 ") ); MemberVO memberVO = new MemberVO(); BeanUtils.copyProperties(member,memberVO); if(!Objects.isNull(member)){ BeanUtils.copyProperties(member,memberVO); }else{ throw new BusinessException(ResponseStatus.DATA_EMPTY); } return memberVO; }
@@ -7,6 +7,7 @@ import com.doumee.core.utils.HttpsUtil; import com.doumee.core.wx.WXConstant; import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.system.SystemDictDataService; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -14,6 +15,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.DefaultSecurityManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.EnableScheduling; @@ -32,14 +35,16 @@ * @date 2021-10-10 14:40:35 * https://www.bejson.com/othertools/cron/ cron 表达式生成地址 */ @Slf4j @Component @EnableScheduling @Slf4j public class ScheduleTool { @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired private SystemDictDataService systemDictDataService; /** * 是否开发者 */ @@ -52,6 +57,9 @@ */ @Scheduled(fixedDelay=1000 * 60 * 90) public void updAccessToken(){ DefaultSecurityManager securityManager = new DefaultSecurityManager(); SecurityUtils.setSecurityManager(securityManager); String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode(); String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode(); //生成微信token @@ -62,7 +70,7 @@ if(!Objects.isNull(systemDictData)){ systemDictData.setCode(json.getString("access_token")); systemDictData.setUpdateTime(new Date()); systemDictDataBiz.updateByIdNew(systemDictData); systemDictDataService.updateById(systemDictData); log.info(" 更新微信公众号 ACCESS_TOKEN =========> " + systemDictData.getCode() ); } }
