diff --git a/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java b/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java index 8ec4ce59..7d4affb8 100644 --- a/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java +++ b/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java @@ -15,7 +15,7 @@ public @interface LimitSubmit { /** * 间隔时间(ms),在世界间隔内超过执行次数,视为被限制 */ - int interval() default 1000; + int interval() default 500; /** * 提示消息 diff --git a/src/main/java/com/qs/serve/modules/base/TencentYunSmsService.java b/src/main/java/com/qs/serve/modules/base/TencentYunSmsService.java index c0010187..deeffcc8 100644 --- a/src/main/java/com/qs/serve/modules/base/TencentYunSmsService.java +++ b/src/main/java/com/qs/serve/modules/base/TencentYunSmsService.java @@ -53,7 +53,7 @@ public class TencentYunSmsService { req.setTemplateId(templateId); //todo 调整短信模板 - String[] templateParamSet = {code,code,code}; + String[] templateParamSet = {code}; req.setTemplateParamSet(templateParamSet); String[] phoneNumberSet = {"+86"+phone}; diff --git a/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java b/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java index d5e13a5e..24aa6792 100644 --- a/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java +++ b/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java @@ -6,22 +6,21 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.CopierUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.baz.entity.BazVisit; import com.qs.serve.modules.baz.entity.BazVisitInstance; import com.qs.serve.modules.baz.entity.bo.BazCreateVisitInstanceBo; import com.qs.serve.modules.baz.entity.bo.BazVisitInstanceFlowBo; import com.qs.serve.modules.baz.entity.so.BazVisitInstanceSo; import com.qs.serve.modules.baz.service.BazVisitInstanceService; +import com.qs.serve.modules.baz.service.BazVisitService; import com.qs.serve.modules.sys.service.SysUserSalesService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.time.LocalDate; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -38,6 +37,7 @@ import java.util.Map; public class BazMyVisitInstanceController { private BazVisitInstanceService bazVisitInstanceService; + private BazVisitService visitService; private SysUserSalesService sysUserSalesService; @@ -109,6 +109,25 @@ public class BazMyVisitInstanceController { return R.ok(map,"ok"); } + /** + * 统计创建数量(用于判断当天是否提交) + * @param visitId + * @param targetId + * @return + */ + @GetMapping("/countCreate") + public R getPage(String visitId,String targetId){ + BazVisit bazVisit = visitService.getById(visitId); + LambdaQueryWrapper limitVisitLqw = new LambdaQueryWrapper<>(); + limitVisitLqw.eq(BazVisitInstance::getVisitorId,AuthContextUtils.getSysUserId()); + limitVisitLqw.eq(BazVisitInstance::getTargetType,bazVisit.getTargetType()); + limitVisitLqw.eq(BazVisitInstance::getTargetId,targetId); + limitVisitLqw.ge(BazVisitInstance::getCreateTime, LocalDate.now()); + long count = bazVisitInstanceService.count(limitVisitLqw); + return R.ok(count); + } + + /** * 创建流程 * @param param diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index fcca7612..63a3757e 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -13,6 +13,7 @@ import com.qs.serve.common.util.StringUtils; import com.qs.serve.modules.baz.common.BazTargetTypeConsts; import com.qs.serve.modules.baz.entity.BazVisitInfo; import com.qs.serve.modules.baz.service.BazVisitInfoService; +import com.qs.serve.modules.bms.common.MasterUserType; import com.qs.serve.modules.bms.entity.BmsChannel; import com.qs.serve.modules.bms.entity.BmsRegion; import com.qs.serve.modules.bms.entity.BmsRegion2; @@ -21,9 +22,7 @@ import com.qs.serve.modules.bms.entity.bo.BmsChannelPointMapInfoBo; import com.qs.serve.modules.bms.entity.so.BmsPointVisitSo; import com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo; import com.qs.serve.modules.bms.mapper.BmsChannelPointMapper; -import com.qs.serve.modules.bms.service.BmsChannelService; -import com.qs.serve.modules.bms.service.BmsRegion2Service; -import com.qs.serve.modules.bms.service.BmsRegionService; +import com.qs.serve.modules.bms.service.*; import com.qs.serve.modules.his.service.HisUserChannelPointService; import com.qs.serve.modules.sys.common.enums.BusinessLogType; import com.qs.serve.modules.sys.service.SysBusinessLogService; @@ -35,7 +34,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import com.qs.serve.modules.bms.entity.BmsChannelPoint; -import com.qs.serve.modules.bms.service.BmsChannelPointService; import javax.validation.Valid; import java.util.List; @@ -60,6 +58,7 @@ public class BmsChannelPointController { private TbsActivityChannelPointService activityChannelPointService; private BmsChannelPointMapper channelPointMapper; private HisUserChannelPointService hisUserChannelPointService; + private BmsMasterUserService bmsMasterUserService; /** * 获取我负责的网点 @@ -191,6 +190,8 @@ public class BmsChannelPointController { } BmsChannelPoint point = bmsChannelPointService.getById(id); boolean result = bmsChannelPointService.removeById(id); + //删除权限关联 + bmsMasterUserService.removeMgrUser(MasterUserType.Point,id+""); hisUserChannelPointService.removeByPointId(id); //添加日志 businessLogService.buildLog4Delete(BusinessLogType.Point,id+"",point.getPointCode(),point.getPointName(),null); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java index a3e2c7e1..1f217ea6 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -114,6 +114,7 @@ public class BmsSupplierVisitAddressController { public R> getPage(BmsSupplierVisitAddress param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); PageUtil.startPage(); + lqw.orderByDesc(BmsSupplierVisitAddress::getCreateTime); List list = bmsSupplierVisitAddressService.list(lqw); for (BmsSupplierVisitAddress visitAddress : list) { BmsSupplier supplier = bmsSupplierService.getById(visitAddress.getSupplierId()); @@ -214,6 +215,9 @@ public class BmsSupplierVisitAddressController { @PreAuthorize("hasRole('bms:supplierVisitAddress:update')") public R updateById(@RequestBody @Valid BmsSupplierVisitAddress param){ BmsSupplierVisitAddress dbData = bmsSupplierVisitAddressService.getById(param.getId()); + if(!dbData.getAddressType().equals(param.getAddressType())){ + param.setDefaultFlag(0); + } boolean result = bmsSupplierVisitAddressService.updateById(param); businessLogService.buildLog4Change(BusinessLogType.SupplierAddress,dbData.getSupplierId().toString(), dbData.getSupplierCode(),dbData.getSupplierName(),dbData.getId(),dbData,param); diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java index 108f6a17..f639416c 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsMasterUserService.java @@ -12,6 +12,7 @@ import com.qs.serve.modules.bms.entity.BmsRegionUser; public interface BmsMasterUserService extends IService { void removeMgrUser(String type, String targetId, String userId); + void removeMgrUser(String type, String targetId); BmsMasterUser getByParam(String type, String targetId, String userId); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java index 32b01299..97ac51cb 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java @@ -29,6 +29,14 @@ public class BmsMasterUserServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsMasterUser::getTargetId,targetId); + lqw.eq(BmsMasterUser::getType,type); + this.remove(lqw); + } + @Override public BmsMasterUser getByParam(String type, String targetId, String userId) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java index 4a0b4ba6..f3cc3d80 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java @@ -206,13 +206,13 @@ public class QmsGroupController { }else { lqw.ne(QmsGroupScope::getFinished,-1); } - if(code!=null){ + if(StringUtils.hasText(code)){ lqw.like(QmsGroupScope::getUserCode,code); } - if(name!=null){ + if(StringUtils.hasText(name)){ lqw.like(QmsGroupScope::getUserName,name); } - if(groupId!=null){ + if(StringUtils.hasText(groupId)){ lqw.eq(QmsGroupScope::getGroupId,groupId); } lqw.ne(QmsGroupScope::getScopeType,0); diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java index b2818667..c75675b2 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java @@ -111,7 +111,45 @@ public class SysUser implements Serializable { /** 致远用户id */ private String syUserId; + /** 一级区域ID */ + @Length(max = 32,message = "一级区域ID长度不能超过32字") + private String regionFirst; + /** 二级区域ID */ + @Length(max = 32,message = "二级区域ID长度不能超过32字") + private String regionSecond; + + /** 三级区域ID */ + @Length(max = 32,message = "三级区域ID长度不能超过32字") + private String regionThird; + + /** 4级区域ID */ + @Length(max = 32,message = "4级区域ID长度不能超过32字") + private String regionFourthly; + + /** 最子级区域ID */ + @Length(max = 32,message = "最子级区域ID长度不能超过32字") + private String regionLast; + + /** 行政一级区域ID */ + @Length(max = 32,message = "行政一级区域ID长度不能超过32字") + private String region2First; + + /** 行政二级区域ID */ + @Length(max = 32,message = "行政二级区域ID长度不能超过32字") + private String region2Second; + + /** 行政三级区域ID */ + @Length(max = 32,message = "行政三级区域ID长度不能超过32字") + private String region2Third; + + /** 行政最子级区域ID */ + @Length(max = 32,message = "行政最子级区域ID长度不能超过32字") + private String region2Last; + + /** 行政4级区域ID */ + @Length(max = 32,message = "行政4级区域ID长度不能超过32字") + private String region2Fourthly; /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java index e351d39f..ff41438d 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java +++ b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java @@ -68,5 +68,8 @@ public interface SysUserService extends IService { */ void reEntry(String userId); + + List listByChildIds(String userId); + } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index 509b6602..c411dc8b 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -247,5 +247,11 @@ public class SysUserServiceImpl extends ServiceImpl impl this.updateById(user); } + @Override + public List listByChildIds(String userId) { + + return null; + } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e06b6a3e..47357739 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -15,7 +15,7 @@ tencent: secret-key: iLkjeKzHwegQ4eE55xX9byXmBLxgwypV sdkAppId: 1400174031 signName: 柒胜软件 - templateId: 341678 + templateId: 689207 aliyun: oss: bucket: qsjslservice diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9a93fb28..3f14cb25 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,8 +12,6 @@ spring: project: ignore-url: tenants: #忽略租户拦截 - - /api/dev/** #测试接口 - - /bpm/appr/getById/** - /callback - /favicon.ico - /error @@ -22,7 +20,6 @@ project: - /common/upload #支持API上传调整 - /common/validToken #验证token - /api/** - - /bpm/appr/getById/** - /portal/** - /favicon.ico - /error @@ -45,7 +42,7 @@ mybatis-plus: logging: level: ROOT: info - com.qs.serve.modules: debug + com.qs.serve: debug org.xnio.nio: info org.springframework: info com.baomidou: info