admin/.env.development
@@ -2,7 +2,7 @@ NODE_ENV = 'development' # VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface' #VUE_APP_API_URL = 'http://localhost:10010' VUE_APP_API_URL = 'http://localhost:10010' # VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface' VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface' #VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
@@ -1,6 +1,6 @@ spring: profiles: active: self active: pro application: name: meetingAdmin # 安全配置 server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -153,7 +153,8 @@ LoginUserInfo loginUserInfo = this.getUserInfoByToken(token); //删除老的token redisTemplate.delete(Constants.REDIS_TOKEN_KEY+token); systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda().set(SystemUser::getOpenid,null).eq(SystemUser::getId,loginUserInfo.getId())); systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda().set(SystemUser::getOpenid,null) .eq(SystemUser::getId,loginUserInfo.getId())); } catch (Exception e) { e.printStackTrace(); server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -286,8 +286,8 @@ .set(SystemUser::getOpenidHkDate,null) .set(SystemUser::getOpenidHkInfo,null) .set(SystemUser::getOpenidHkStatus,Constants.ZERO) .ne(SystemUser::getType,Constants.memberType.gkuser) .eq(SystemUser::getOpenid,openid) // .eq(SystemUser::getType,user.getType()) ); systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda() .set(SystemUser::getOpenid,openid) @@ -403,20 +403,20 @@ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT); } //注册司机 if(!((Constants.equalsInteger(user.getType(),Constants.ZERO) if((Constants.equalsInteger(user.getType(),Constants.ZERO) ||Constants.equalsInteger(user.getType(),Constants.TWO)) && Objects.nonNull(user.getMemberId()))){ // if(Constants.equalsInteger(user.getType(),Constants.TWO)){ // if(Objects.isNull(user.getCompanyId())){ // throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN); // } // Company company = companyMapper.selectById(user.getCompanyId()); // if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){ // throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN); // } // } // }else{ && Objects.nonNull(user.getMemberId())){ if(Constants.equalsInteger(user.getType(),Constants.TWO)){ if(Objects.isNull(user.getCompanyId())){ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN.getCode(),"对不起，该账号不能登录司机端哦~"); } /* Company company = companyMapper.selectById(user.getCompanyId()); if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN); }*/ } }else{ throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN.getCode(),"对不起，该账号不能登录司机端哦！"); } if(StringUtils.isNotBlank(password)){ String pwd = Utils.Secure.encryptPassword(new String(password), user.getSalt()); @@ -473,7 +473,7 @@ if (systemUser == null) { systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true); }else{ if(!(Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)||Constants.equalsInteger(systemUser.getType(),Constants.memberType.internal))){ if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，请使用正确的司机账号登陆！"); } } server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: self active: pro application: name: visitsAdmin # 安全配置 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1735,8 +1735,11 @@ }else if(source == 3){ //处理tms管控人员自动授权逻辑 dealGkUserAuthBiz(wxAuthorizeVO,openId,source); }else if(source == 0){ //如果是司机，则从system_user查询 dealDriverUserAuthBiz(wxAuthorizeVO,openId,source); }else{ //如果是司机或者内部人员，则从system_user查询 //如果是内部人员，则从system_user查询 dealSystemUserAuthBiz(wxAuthorizeVO,openId,source); } return wxAuthorizeVO; @@ -1745,17 +1748,48 @@ private void dealSystemUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) { SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() .eq(SystemUser::getOpenid,openId) .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source) .in(SystemUser::getType,Constants.memberType.internal) .eq(SystemUser::getDeleted,Boolean.FALSE) .last(" limit 1 ")); //非访客用户 进行判断是否存在用户 if(!Objects.isNull(user)){ Member member = memberMapper.selectById(user.getMemberId()); if(member.getIsdeleted() == Constants.ONE){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员"); if(member == null || member.getIsdeleted() == Constants.ONE){ return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员"); } if(member.getStatus() != Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员"); return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员"); } if(StringUtils.isNotBlank(member.getIdcardNo())){ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo())); } String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); member.setPrefixUrl(prefixUrl); wxAuthorizeVO.setMember(member); //司机 与 内部人员 提供token String token = systemLoginService.loginByUserId(user.getId()); wxAuthorizeVO.setToken(token); } } private void dealDriverUserAuthBiz(WxAuthorizeVO wxAuthorizeVO, String openId, Integer source) { SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() .eq(SystemUser::getOpenid,openId) .in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver) .eq(SystemUser::getDeleted,Boolean.FALSE) .last(" limit 1 ")); //非访客用户 进行判断是否存在用户 if(!Objects.isNull(user)){ Member member = memberMapper.selectById(user.getMemberId()); if(member == null || member.getIsdeleted() == Constants.ONE){ return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员"); } if(member.getStatus() != Constants.ZERO){ return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员"); } if(StringUtils.isNotBlank(member.getIdcardNo())){ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo())); @@ -1775,7 +1809,7 @@ SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda() .eq(SystemUser::getOpenid,openId) .eq(SystemUser::getType,source) .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source) // .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source) .eq(SystemUser::getDeleted,Boolean.FALSE) .last(" limit 1 ")); //非访客用户 进行判断是否存在用户 @@ -1784,21 +1818,13 @@ tp.setTel(user.getMobile()); TmsEmployeeListResponse response = tmsService.getEmployeeList(tp); if(response == null || response.getTel()==null){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该账户人员信息不正确，如有疑问请联系系统管理员查看！"); return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该账户人员信息不正确，如有疑问请联系系统管理员查看！"); } Member member = memberMapper.selectById(user.getMemberId()); if(member.getIsdeleted() == Constants.ONE){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员"); } if(member.getStatus() != Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员"); } if(StringUtils.isNotBlank(member.getIdcardNo())){ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo())); } String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); member.setPrefixUrl(prefixUrl); Member member = new Member(); member.setPhone(user.getMobile()); // member.setId(user.getId()); wxAuthorizeVO.setMember(member); //司机 与 内部人员 提供token String token = systemLoginService.loginByUserId(user.getId()); @@ -1820,10 +1846,12 @@ //非访客用户 进行判断是否存在用户 if(!Objects.isNull(member)){ if(member.getIsdeleted() == Constants.ONE){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员"); return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员"); } if(member.getStatus() != Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员"); return; // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员"); } if(StringUtils.isNotBlank(member.getIdcardNo())){ member.setIdcardDecode(DESUtil.decrypt(Constants.EDS_PWD, member.getIdcardNo())); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -111,7 +111,7 @@ param.put("componentMenuId", data.getMenuCode()); JSONObject c = new JSONObject(); c.put("method","dealTlncMsg"); c.put("argument",JSONObject.toJSONString(data)); c.put("argument", data); param.put("callback",c); Notices notices = new Notices(); notices.setCreateDate(DateUtil.getISO8601DateByStr(data.getMsgCreateTimeIso())); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1627,27 +1627,50 @@ energyDataVOList.add(data); } }else{ String lastYear = null; int lastMonths = 0,curMonths =0; String curYear =DateUtil.getFomartDate(new Date(),"yyyy"); for (int i = 0; i < 12; i++) { Date tempDate = DateUtil.increaseMonth(lastMonth,i); String tt =DateUtil.getFomartDate(tempDate,"yyyy"); if(!StringUtils.equals(curYear,tt)){ lastYear = tt; lastMonths = i+1;//去年的月份数 } EnergyDataVO data = new EnergyDataVO(); data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM")); // data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"月")); data.setEnergy(new BigDecimal(0)); energyDataVOList.add(data); } //如果是用电数据 curMonths = 12 - lastMonths;//今年的月份数 EnergyTrendRequest param = new EnergyTrendRequest(); param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//年份 param.setMeterType(1); param.setNodeType(2); param.setNodeId("root000000"); param.setPeriodType("year"); if(lastYear!=null){ //如果是用电数据 param.setDate(lastYear);//查询去年年份 BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param); if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){ for (int i = 0; i < 12; i++) { if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){ for (int i = 0; i < lastMonths; i++) { //0,11，取值1-12 if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>curMonths+i){ //取相应的参数值 energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0"))); energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[curMonths+i],"0"))); } } } } //如果是用电数据 param.setDate(curYear);//年份 BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param); if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){ for (int i = lastMonths; i < 12; i++) { //12 取值 0 if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i-lastMonths){ //取相应的参数值 energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i-lastMonths],"0"))); } }
