Compare commits

..

No commits in common. "e3febc2bb8b39bbab18a473d12946aebc13bd61d" and "aa9d10083a6eda7fbdba44bb0162709b10fa30a0" have entirely different histories.

237 changed files with 1993 additions and 2503 deletions

View File

@ -1,6 +1,7 @@
package com.changhu.common.annotation;
import com.changhu.common.db.enums.UserType;
import org.springframework.web.bind.annotation.RestController;
import java.lang.annotation.*;
@ -12,6 +13,7 @@ import java.lang.annotation.*;
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@RestController
public @interface CheckUserType {
/**

View File

@ -4,7 +4,7 @@ import java.lang.annotation.*;
/**
* author: luozhun
* desc: 标注是拓展属性
* desc: 是拓展属性
* createTime: 2023/11/1 17:25
*/
@Documented

View File

@ -1,14 +0,0 @@
package com.changhu.common.annotation;
import java.lang.annotation.*;
/**
* @author 20252
* @createTime 2024/11/21 下午3:34
* @desc IsWhiteList...
*/
@Documented
@Retention(value = RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface IsWhiteList {
}

View File

@ -1,5 +1,7 @@
package com.changhu.common.annotation;
import org.springframework.web.bind.annotation.RestController;
import java.lang.annotation.*;
/**
@ -10,6 +12,7 @@ import java.lang.annotation.*;
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@RestController
public @interface JsonBody {
boolean value() default true;
}

View File

@ -2,121 +2,38 @@ package com.changhu.config;
import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ClassUtil;
import com.changhu.common.annotation.IsWhiteList;
import com.changhu.common.annotation.JsonBody;
import com.changhu.filter.BodyWrapperFilter;
import com.changhu.interceptor.JsonBodyInterceptor;
import com.changhu.interceptor.OpenApiAuthInterceptor;
import com.changhu.interceptor.UserTypeInterceptor;
import lombok.extern.slf4j.Slf4j;
import com.changhu.support.filter.BodyWrapperFilter;
import com.changhu.support.interceptor.JsonBodyInterceptor;
import com.changhu.support.interceptor.SignInterceptor;
import com.changhu.support.interceptor.UserTypeInterceptor;
import org.jetbrains.annotations.NotNull;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.*;
import java.util.stream.Collectors;
import java.util.ArrayList;
import java.util.List;
/**
* author: luozhun
* desc: WebConfig
* createTime: 2023/8/18 10:56
*/
@Slf4j
@Configuration
public class WebConfig implements WebMvcConfigurer {
private final List<String> whiteList = new ArrayList<>();
/**
* 扫描所有Controller
*/
private static Set<Class<?>> scanRestController() {
//需要过滤出JsonBody
Set<Class<?>> classes = ClassUtil.scanPackage("com.changhu", clazz -> !JsonBody.class.equals(clazz));
return classes.stream().filter(aClass -> {
//判断类上是否有Controller注解
if (aClass.isAnnotationPresent(Controller.class) || aClass.isAnnotationPresent(RestController.class)) {
return true;
}
Annotation[] annotations = aClass.getAnnotations();
for (Annotation annotation : annotations) {
if (annotation.annotationType().isAnnotationPresent(Controller.class) || annotation.annotationType().isAnnotationPresent(RestController.class)) {
return true;
}
}
return false;
}).collect(Collectors.toSet());
}
public WebConfig() {
Set<String> w = new HashSet<>();
for (Class<?> clazz : scanRestController()) {
//类上的注解
RequestMapping classRequestMapping = AnnotatedElementUtils.findMergedAnnotation(clazz, RequestMapping.class);
IsWhiteList clazzIsWhiteList = clazz.getAnnotation(IsWhiteList.class);
if (classRequestMapping != null && clazzIsWhiteList != null) {
//直接放行当前控制器的所有方法
w.addAll(Arrays.stream(classRequestMapping.value()).map(path -> {
if (!path.startsWith("/")) {
path = "/" + path;
}
if (!path.endsWith("/")) {
path = path + "/";
}
return path + "**";
}).toList());
continue;
}
//看方法上是否有白名单注解
Method[] methods = clazz.getDeclaredMethods();
for (Method method : methods) {
IsWhiteList methodIsWhiteList = method.getAnnotation(IsWhiteList.class);
RequestMapping methodRequestMapping = AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class);
if (methodRequestMapping != null && methodIsWhiteList != null) {
List<List<String>> list1 = Arrays.stream(methodRequestMapping.value()).map(path -> {
if (!path.startsWith("/")) {
path = "/" + path;
}
if (path.endsWith("/")) {
path = path.substring(0, path.length() - 1);
}
List<String> list = new ArrayList<>();
if (classRequestMapping != null && CollUtil.isNotEmpty(Arrays.asList(classRequestMapping.value()))) {
for (String p : classRequestMapping.value()) {
if (!p.startsWith("/")) {
p = "/" + p;
}
if (p.endsWith("/")) {
p = p.substring(0, p.length() - 1);
}
list.add(p + path);
}
} else {
list.add(path);
}
return list;
}).toList();
w.addAll(list1.stream().flatMap(List::stream).toList());
}
}
}
log.info("加载路由白名单:{}", w);
whiteList.addAll(w);
//网站图标
whiteList.add("/common/**");
whiteList.add("/open/**");
whiteList.add("/test/**");
whiteList.add("/login");
whiteList.add("/logout");
whiteList.add("/favicon.ico");
//druid console
whiteList.add("/druid/**");
@ -126,6 +43,12 @@ public class WebConfig implements WebMvcConfigurer {
whiteList.add("/swagger-resources");
whiteList.add("/**webjars/**");
whiteList.add("/v3/**");
//获取企业注册审核状态
whiteList.add("/management/getCheckStatus");
//微信小程序注册
whiteList.add("/miniProgramUser/register");
//二维码表单录入保安人员
whiteList.add("/miniProgramUser/qrCodeFormInputSecurityUser");
}
@Override
@ -134,12 +57,12 @@ public class WebConfig implements WebMvcConfigurer {
registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
.addPathPatterns("/**")
.excludePathPatterns(whiteList);
// 注册jsonBody拦截器 用于标识是否需要JsonResult返回
// 注册jsonBody 拦截器 用于标识是否需要JsonResult返回
registry.addInterceptor(new JsonBodyInterceptor());
// 注册用户类型拦截器 用于校验当前用户是否匹配操作客户端
// 注册clientType 拦截器 用于校验当前用户是否匹配操作客户端
registry.addInterceptor(new UserTypeInterceptor());
// 注册开放接口认证拦截器 用于校验第三方是否授权
registry.addInterceptor(new OpenApiAuthInterceptor())
// 注册开放接口 拦截器 用于校验第三方是否携带指定apiKey
registry.addInterceptor(new SignInterceptor())
.addPathPatterns("/open/**");
}

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.controller;
package com.changhu.controller;
import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.lang.Dict;
@ -6,15 +6,17 @@ import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.controller.OpenController;
import com.changhu.module.superManagement.pojo.params.GeneratedAccessKeyParams;
import com.changhu.pojo.entity.AccessKeys;
import com.changhu.pojo.params.GeneratedAccessKeyParams;
import com.changhu.service.AccessKeysService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.Arrays;
import java.util.List;
@ -24,11 +26,10 @@ import java.util.List;
* @createTime 2024/11/19 上午10:38
* @desc AccessKeysController...
*/
@Tag(name = "超级后台-开放平台")
@RequestMapping("/m1/accessKeys")
@Tag(name = "开放平台")
@RequestMapping("/accessKeys")
@JsonBody
@CheckUserType(userTypes = UserType.MANAGEMENT_SUPER)
@RestController
public class AccessKeysController {
@Autowired

View File

@ -1,6 +1,5 @@
package com.changhu.controller;
import com.changhu.common.annotation.IsWhiteList;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.cache.GlobalCacheManager;
import com.changhu.common.pojo.model.JsonResult;
@ -32,8 +31,6 @@ import java.util.Map;
@Tag(name = "公共接口")
@RequestMapping("/common")
@JsonBody
@IsWhiteList
@RestController
public class CommonController {
@Autowired

View File

@ -1,6 +1,5 @@
package com.changhu.controller;
import com.changhu.common.annotation.IsWhiteList;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.pojo.vo.TokenInfo;
import com.changhu.pojo.params.LoginParams;
@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 20252
@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Tag(name = "登录相关")
@JsonBody
@RestController
public class LoginController {
@Autowired
@ -28,14 +25,12 @@ public class LoginController {
@Operation(summary = "登录")
@PostMapping("/login")
@IsWhiteList
public TokenInfo login(@RequestBody LoginParams loginParams) {
return loginService.login(loginParams);
}
@Operation(summary = "登出")
@GetMapping("/logout")
@IsWhiteList
public void logout() {
loginService.logout();
}

View File

@ -1,6 +1,5 @@
package com.changhu.controller;
import com.changhu.common.annotation.IsWhiteList;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.pojo.dto.DataViewDTO;
@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -28,8 +26,6 @@ import java.util.List;
@Tag(name = "开放接口")
@JsonBody
@RequestMapping("/open")
@IsWhiteList
@RestController
public class OpenController {
@Autowired

View File

@ -1,36 +0,0 @@
package com.changhu.controller;
import com.changhu.common.annotation.JsonBody;
import com.changhu.service.WxService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @author 20252
* @createTime 2024/11/22 上午11:42
* @desc WeChatController...
*/
@Tag(name = "微信相关")
@Controller
@RequestMapping("/wx")
public class WeChatController {
@Autowired
private WxService wxService;
@JsonBody(value = false)
@Operation(summary = "获取小程序页面二维码")
@GetMapping(value = "/qrCode")
public ResponseEntity<Resource> qrCode(@Schema(description = "要生成的路径") @RequestParam String path,
@Schema(description = "生成二维码的宽度") @RequestParam(defaultValue = "430") Integer width) {
return wxService.qrCode(path, width);
}
}

View File

@ -1,6 +1,6 @@
package com.changhu.strategy;
package com.changhu.enums;
import com.changhu.strategy.handler.clientType.*;
import com.changhu.enums.handler.*;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.clientType;
package com.changhu.enums.handler;
import com.alibaba.fastjson2.JSONObject;
import com.changhu.common.pojo.vo.TokenInfo;

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.clientType;
package com.changhu.enums.handler;
import cn.dev33.satoken.stp.SaTokenInfo;
import com.alibaba.fastjson2.JSONObject;
@ -11,8 +11,8 @@ import com.changhu.common.pojo.vo.TokenInfo;
import com.changhu.common.utils.RsaUtil;
import com.changhu.common.utils.UserUtil;
import com.changhu.common.utils.ValidatorUtil;
import com.changhu.pojo.entity.ManagementPoliceUnitUser;
import com.changhu.pojo.entity.PoliceUnit;
import com.changhu.module.management.pojo.entity.ManagementPoliceUnitUser;
import com.changhu.module.management.pojo.entity.PoliceUnit;
import com.changhu.pojo.params.ManagementPoliceUnitLoginParams;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.clientType;
package com.changhu.enums.handler;
import cn.dev33.satoken.stp.SaTokenInfo;
import com.alibaba.fastjson2.JSONObject;
@ -11,8 +11,8 @@ import com.changhu.common.pojo.vo.TokenInfo;
import com.changhu.common.utils.RsaUtil;
import com.changhu.common.utils.UserUtil;
import com.changhu.common.utils.ValidatorUtil;
import com.changhu.pojo.entity.ManagementSecurityUnitUser;
import com.changhu.pojo.entity.SecurityUnit;
import com.changhu.module.management.pojo.entity.ManagementSecurityUnitUser;
import com.changhu.module.management.pojo.entity.SecurityUnit;
import com.changhu.pojo.params.ManagementSecurityUnitLoginParams;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.clientType;
package com.changhu.enums.handler;
import cn.dev33.satoken.stp.SaTokenInfo;
import com.alibaba.fastjson2.JSONObject;
@ -10,7 +10,7 @@ import com.changhu.common.pojo.vo.TokenInfo;
import com.changhu.common.utils.RsaUtil;
import com.changhu.common.utils.UserUtil;
import com.changhu.common.utils.ValidatorUtil;
import com.changhu.pojo.entity.ManagementSuperUser;
import com.changhu.module.management.pojo.entity.ManagementSuperUser;
import com.changhu.pojo.params.ManagementSuperLoginParams;
/**

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.clientType;
package com.changhu.enums.handler;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
@ -16,7 +16,7 @@ import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.TokenInfo;
import com.changhu.common.utils.UserUtil;
import com.changhu.common.utils.ValidatorUtil;
import com.changhu.pojo.entity.MiniProgramUser;
import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser;
import com.changhu.pojo.params.MiniProgramUserLoginParams;
import me.chanjar.weixin.common.error.WxErrorException;

View File

@ -1,15 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.CkAssessmentRecord;
import org.apache.ibatis.annotations.Mapper;
/**
* ck_assessment_record (考核记录) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface CkAssessmentRecordMapper extends BaseMapper<CkAssessmentRecord> {
}

View File

@ -1,15 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.CkProject;
import org.apache.ibatis.annotations.Mapper;
/**
* ck_project (考核项目) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface CkProjectMapper extends BaseMapper<CkProject> {
}

View File

@ -1,28 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.db.enums.MiniProgramUserIdentity;
import com.changhu.pojo.vo.UnitMiniProgramUserPagerQueryParams;
import com.changhu.pojo.vo.UnitMiniProgramUserPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author 20252
* @createTime 2024/11/22 上午9:05
* @desc ManagementMapper...
*/
@Mapper
public interface ManagementMapper {
/**
* 分页查询
*
* @param page 分页参数
* @param params 查询参数
* @param identity 用户身份
* @return 结果
*/
Page<UnitMiniProgramUserPagerVo> miniProgramUserPager(@Param("page") Page<UnitMiniProgramUserPagerVo> page,
@Param("params") UnitMiniProgramUserPagerQueryParams params,
@Param("identity") MiniProgramUserIdentity identity);
}

View File

@ -1,15 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.ManagementPoliceUnitUser;
import org.apache.ibatis.annotations.Mapper;
/**
* management_police_user (后台-公安单位用户表) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface ManagementPoliceUnitUserMapper extends BaseMapper<ManagementPoliceUnitUser> {
}

View File

@ -1,15 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.ManagementSecurityUnitUser;
import org.apache.ibatis.annotations.Mapper;
/**
* management_security_unit_user (后台-保安单位用户表) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface ManagementSecurityUnitUserMapper extends BaseMapper<ManagementSecurityUnitUser> {
}

View File

@ -1,14 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.MiniProgramUser;
import org.apache.ibatis.annotations.Mapper;
/**
* mini_program_user (小程序用户) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface MiniProgramUserMapper extends BaseMapper<MiniProgramUser> {
}

View File

@ -3,7 +3,6 @@ package com.changhu.mapper;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.pojo.dto.SecurityUnitUseStatisticsDTO;
import com.changhu.pojo.dto.SecurityUserRosterDTO;
import com.changhu.pojo.dto.ServiceProjectDTO;
import com.changhu.pojo.params.EnterprisesUnitOrServiceProjectType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -28,14 +27,6 @@ public interface OpenApiMapper {
List<SelectNodeVo<Long>> getEnterprisesUnit(@Param("code") String code,
@Param("level") Integer level);
/**
* 获取企事业单位下的服务项目
*
* @param enterprisesUnitId 企事业单位id
* @return 服务项目列表
*/
List<ServiceProjectDTO> getServiceProjectByEnterprisesUnitId(@Param("enterprisesUnitId") Long enterprisesUnitId);
/**
* 保安单位使用情况统计
*

View File

@ -1,15 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.PoliceUnit;
import org.apache.ibatis.annotations.Mapper;
/**
* police_unit (公安单位) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface PoliceUnitMapper extends BaseMapper<PoliceUnit> {
}

View File

@ -1,15 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.SecurityUnit;
import org.apache.ibatis.annotations.Mapper;
/**
* security_unit (保安单位) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface SecurityUnitMapper extends BaseMapper<SecurityUnit> {
}

View File

@ -1,27 +0,0 @@
package com.changhu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo;
import com.changhu.pojo.entity.ServiceProject;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* service_project (服务项目) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface ServiceProjectMapper extends BaseMapper<ServiceProject> {
/**
* 获取服务项目
*
* @return 服务项目列表
*/
List<IndexServiceProjectListVo> getServiceProjectList(@Param("policeUnitId") Long policeUnitId,
@Param("projectManagerMiniProgramUserId") Long projectManagerMiniProgramUserId);
}

View File

@ -1,43 +1,67 @@
package com.changhu.module.superManagement.controller;
package com.changhu.module.assessmentCriteria.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.exception.MessageException;
import com.changhu.module.superManagement.pojo.params.CkGroupSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.params.CkItemSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.params.CkProjectSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.params.CkStandardSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.superManagement.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.superManagement.pojo.vo.CkProjectPagerVo;
import com.changhu.module.superManagement.service.AssessmentCriteriaService;
import com.changhu.pojo.entity.CkGroup;
import com.changhu.pojo.entity.CkItem;
import com.changhu.pojo.entity.CkStandard;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.module.assessmentCriteria.pojo.entity.CkGroup;
import com.changhu.module.assessmentCriteria.pojo.entity.CkItem;
import com.changhu.module.assessmentCriteria.pojo.entity.CkStandard;
import com.changhu.module.assessmentCriteria.pojo.params.*;
import com.changhu.module.assessmentCriteria.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentCriteriaRuleVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectPagerVo;
import com.changhu.module.assessmentCriteria.service.AssessmentCriteriaService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author 20252
* @createTime 2024/11/22 下午2:36
* @createTime 2024/11/6 上午10:02
* @desc AssessmentCriteriaController...
*/
@Tag(name = "超级后台-考核标准")
@Tag(name = "考核标准")
@JsonBody
@RequestMapping("/m1/ac")
@RestController
@RequestMapping("/assessmentCriteria")
@CheckUserType(userTypes = UserType.MANAGEMENT_SUPER)
public class AssessmentCriteriaController {
@Autowired
private AssessmentCriteriaService assessmentCriteriaService;
@Operation(summary = "根据类型获取考核项目列表")
@GetMapping("/ckProjectListByType")
@CheckUserType(value = false)
public List<SelectNodeVo<Long>> ckProjectListByType(@RequestParam EnterprisesUnitType type) {
return assessmentCriteriaService.assessmentCriteriaListByType(type);
}
@Operation(summary = "根据考核项目获取考核规则")
@GetMapping("/assessmentCriteriaRulesByCkProjectId")
@CheckUserType(value = false)
public List<AssessmentCriteriaRuleVo> assessmentCriteriaRulesByCkProjectId(@RequestParam Long ckProjectId) {
return assessmentCriteriaService.assessmentCriteriaRulesByCkProjectId(ckProjectId);
}
@Operation(summary = "提交考核记录")
@PostMapping("/submitAssessmentRecord")
@CheckUserType(value = false)
public void submitAssessmentRecord(@Validated @RequestBody AssessmentRecordParams params) {
assessmentCriteriaService.submitAssessmentRecord(params);
}
@Operation(summary = "考核项目分页查询")
@PostMapping("/ckProjectPagerVoPager")
public Page<CkProjectPagerVo> ckProjectPagerVoPager(@RequestBody PageParams<CkProjectPagerQueryParams, CkProjectPagerVo> queryParams) {
@ -106,4 +130,5 @@ public class AssessmentCriteriaController {
throw new MessageException();
}
}
}

View File

@ -1,13 +1,13 @@
package com.changhu.module.superManagement.controller;
package com.changhu.module.assessmentCriteria.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.module.superManagement.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.superManagement.pojo.vo.AssessmentRecordDetailVo;
import com.changhu.module.superManagement.pojo.vo.AssessmentRecordPagerVo;
import com.changhu.module.superManagement.service.AssessmentRecordService;
import com.changhu.module.assessmentCriteria.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordDetailVo;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordPagerVo;
import com.changhu.module.assessmentCriteria.service.CkAssessmentRecordService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -21,24 +21,24 @@ import java.util.List;
* @createTime 2024/11/8 下午3:51
* @desc AssessmentRecordController...
*/
@Tag(name = "超级后台-考核记录")
@Tag(name = "考核记录详情")
@JsonBody
@RequestMapping("/m1/ar")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SUPER})
@RestController
@RequestMapping("/assessmentRecord")
public class AssessmentRecordController {
@Autowired
private AssessmentRecordService assessmentRecordService;
private CkAssessmentRecordService assessmentRecordService;
@Operation(summary = "考核记录分页")
@PostMapping("/pager")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SUPER})
public Page<AssessmentRecordPagerVo> pager(@RequestBody PageParams<AssessmentRecordPagerQueryParams, AssessmentRecordPagerVo> queryParams) {
return assessmentRecordService.pager(queryParams);
}
@Operation(summary = "扣分详情")
@GetMapping("/deductedDetail")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SUPER})
public List<AssessmentRecordDetailVo> deductedDetail(@RequestParam Long assessmentRecordId) {
return assessmentRecordService.deductedDetail(assessmentRecordId);
}

View File

@ -1,7 +1,7 @@
package com.changhu.mapper;
package com.changhu.module.assessmentCriteria.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.CkAssessmentRecordDetails;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecordDetails;
import org.apache.ibatis.annotations.Mapper;
/**

View File

@ -1,18 +1,21 @@
package com.changhu.module.superManagement.mapper;
package com.changhu.module.assessmentCriteria.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.superManagement.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.superManagement.pojo.vo.AssessmentRecordPagerVo;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecord;
import com.changhu.module.assessmentCriteria.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author 20252
* @createTime 2024/11/22 下午3:05
* @desc AssessmentRecordMapper...
* ck_assessment_record (考核记录) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface AssessmentRecordMapper {
public interface CkAssessmentRecordMapper extends BaseMapper<CkAssessmentRecord> {
/**
* 分页查询
*

View File

@ -1,7 +1,7 @@
package com.changhu.mapper;
package com.changhu.module.assessmentCriteria.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.CkGroup;
import com.changhu.module.assessmentCriteria.pojo.entity.CkGroup;
import org.apache.ibatis.annotations.Mapper;
/**

View File

@ -1,7 +1,7 @@
package com.changhu.mapper;
package com.changhu.module.assessmentCriteria.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.CkItem;
import com.changhu.module.assessmentCriteria.pojo.entity.CkItem;
import org.apache.ibatis.annotations.Mapper;
/**

View File

@ -0,0 +1,39 @@
package com.changhu.module.assessmentCriteria.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.assessmentCriteria.pojo.entity.CkProject;
import com.changhu.module.assessmentCriteria.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* ck_project (考核项目) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface CkProjectMapper extends BaseMapper<CkProject> {
/**
* 分页查询
*
* @param page 分页参数
* @param params 查询参数
* @return 分页数据
*/
Page<CkProjectPagerVo> pager(@Param("page") Page<CkProjectPagerVo> page,
@Param("params") CkProjectPagerQueryParams params);
/**
* 考核项目详情
*
* @param ckProjectId 考核项目id
* @return 详情
*/
List<CkProjectDetailTableVo> ckProjectDetail(@Param("ckProjectId") Long ckProjectId);
}

View File

@ -1,7 +1,7 @@
package com.changhu.mapper;
package com.changhu.module.assessmentCriteria.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.CkStandard;
import com.changhu.module.assessmentCriteria.pojo.entity.CkStandard;
import org.apache.ibatis.annotations.Mapper;
/**

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.SelectType;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.EnterprisesUnitType;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;

View File

@ -1,4 +1,4 @@
package com.changhu.module.miniProgram.pojo.params;
package com.changhu.module.assessmentCriteria.pojo.params;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.params;
package com.changhu.module.assessmentCriteria.pojo.params;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.params;
package com.changhu.module.assessmentCriteria.pojo.params;
import com.changhu.common.db.enums.SelectType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.params;
package com.changhu.module.assessmentCriteria.pojo.params;
import com.changhu.common.db.enums.EnterprisesUnitType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.params;
package com.changhu.module.assessmentCriteria.pojo.params;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.queryParams;
package com.changhu.module.assessmentCriteria.pojo.queryParams;
import com.changhu.common.db.enums.EnterprisesUnitType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.queryParams;
package com.changhu.module.assessmentCriteria.pojo.queryParams;
import com.changhu.common.db.enums.EnterprisesUnitType;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.changhu.module.miniProgram.pojo.vo;
package com.changhu.module.assessmentCriteria.pojo.vo;
import com.changhu.common.db.enums.SelectType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.vo;
package com.changhu.module.assessmentCriteria.pojo.vo;
import com.changhu.common.db.enums.SelectType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.vo;
package com.changhu.module.assessmentCriteria.pojo.vo;
import com.changhu.common.db.enums.EnterprisesUnitType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.vo;
package com.changhu.module.assessmentCriteria.pojo.vo;
import com.changhu.common.db.enums.SelectType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.vo;
package com.changhu.module.assessmentCriteria.pojo.vo;
import com.changhu.common.db.enums.EnterprisesUnitType;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,24 +1,40 @@
package com.changhu.module.superManagement.service;
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.superManagement.pojo.params.CkGroupSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.params.CkItemSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.params.CkProjectSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.params.CkStandardSaveOrUpdateParams;
import com.changhu.module.superManagement.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.superManagement.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.superManagement.pojo.vo.CkProjectPagerVo;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.module.assessmentCriteria.pojo.params.*;
import com.changhu.module.assessmentCriteria.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentCriteriaRuleVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectPagerVo;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import java.util.List;
/**
* @author 20252
* @createTime 2024/11/22 下午2:38
* @createTime 2024/11/6 上午10:07
* @desc AssessmentCriteriaService...
*/
public interface AssessmentCriteriaService {
/**
* 根据类型获取考核标准列表
*
* @param type 类型
* @return 结果
*/
List<SelectNodeVo<Long>> assessmentCriteriaListByType(EnterprisesUnitType type);
/**
* 根据考核项目获取考核规则
*
* @param ckProjectId 考核项目id
* @return 结果
*/
List<AssessmentCriteriaRuleVo> assessmentCriteriaRulesByCkProjectId(Long ckProjectId);
/**
* 考核项目分页查询
*
@ -70,4 +86,10 @@ public interface AssessmentCriteriaService {
*/
void saveOrUpdateCkStandard(CkStandardSaveOrUpdateParams params);
/**
* 提交考核记录
*
* @param params 参数
*/
void submitAssessmentRecord(AssessmentRecordParams params);
}

View File

@ -1,7 +1,7 @@
package com.changhu.service;
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.changhu.pojo.entity.CkAssessmentRecordDetails;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecordDetails;
/**
* ck_assessment_record_details (考核记录明细) 服务类

View File

@ -0,0 +1,35 @@
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecord;
import com.changhu.module.assessmentCriteria.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordDetailVo;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordPagerVo;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import java.util.List;
/**
* ck_assessment_record (考核记录) 服务类
* author: luozhun
* desc 由groovy脚本自动生成
*/
public interface CkAssessmentRecordService extends IService<CkAssessmentRecord> {
/**
* 分页查询
*
* @param queryParams 查询参数
* @return 结果
*/
Page<AssessmentRecordPagerVo> pager(PageParams<AssessmentRecordPagerQueryParams, AssessmentRecordPagerVo> queryParams);
/**
* 扣分详情
*
* @param assessmentRecordId 考核记录id
* @return 结果
*/
List<AssessmentRecordDetailVo> deductedDetail(Long assessmentRecordId);
}

View File

@ -1,7 +1,7 @@
package com.changhu.service;
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.changhu.pojo.entity.CkGroup;
import com.changhu.module.assessmentCriteria.pojo.entity.CkGroup;
/**
* ck_group (考核组) 服务类

View File

@ -1,7 +1,7 @@
package com.changhu.service;
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.changhu.pojo.entity.CkItem;
import com.changhu.module.assessmentCriteria.pojo.entity.CkItem;
/**
* ck_item (分组内的考核项) 服务类

View File

@ -1,7 +1,7 @@
package com.changhu.service;
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.changhu.pojo.entity.CkProject;
import com.changhu.module.assessmentCriteria.pojo.entity.CkProject;
/**
* ck_project (考核项目) 服务类

View File

@ -1,7 +1,7 @@
package com.changhu.service;
package com.changhu.module.assessmentCriteria.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.changhu.pojo.entity.CkStandard;
import com.changhu.module.assessmentCriteria.pojo.entity.CkStandard;
/**
* ck_standard (扣分标准) 服务类

View File

@ -1,18 +1,26 @@
package com.changhu.module.miniProgram.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.lang.func.LambdaUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.common.utils.SnowFlakeIdUtil;
import com.changhu.module.miniProgram.pojo.params.AssessmentRecordParams;
import com.changhu.module.miniProgram.pojo.vo.AssessmentCriteriaRuleVo;
import com.changhu.module.miniProgram.service.SupervisionAssessmentService;
import com.changhu.pojo.entity.*;
import com.changhu.module.assessmentCriteria.mapper.CkProjectMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.*;
import com.changhu.module.assessmentCriteria.pojo.params.*;
import com.changhu.module.assessmentCriteria.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentCriteriaRuleVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectPagerVo;
import com.changhu.module.assessmentCriteria.service.AssessmentCriteriaService;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -22,11 +30,14 @@ import java.util.stream.Collectors;
/**
* @author 20252
* @createTime 2024/11/22 下午2:48
* @desc SupervisionAssessmentServiceImpl...
* @createTime 2024/11/6 上午10:08
* @desc AssessmentCriteriaServiceImpl...
*/
@Service
public class SupervisionAssessmentServiceImpl implements SupervisionAssessmentService {
public class AssessmentCriteriaServiceImpl implements AssessmentCriteriaService {
@Autowired
private CkProjectMapper ckProjectMapper;
@Override
public List<SelectNodeVo<Long>> assessmentCriteriaListByType(EnterprisesUnitType type) {
@ -108,6 +119,61 @@ public class SupervisionAssessmentServiceImpl implements SupervisionAssessmentSe
return groupList;
}
@Override
public Page<CkProjectPagerVo> ckProjectPagerVoPager(PageParams<CkProjectPagerQueryParams, CkProjectPagerVo> queryParams) {
return ckProjectMapper.pager(queryParams.getPage(), queryParams.getParams());
}
@Transactional(rollbackFor = Exception.class)
@Override
public void saveOrUpdateCkProject(CkProjectSaveOrUpdateParams params) {
boolean b = Db.saveOrUpdate(BeanUtil.copyProperties(params, CkProject.class));
if (!b) {
throw new MessageException();
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void deleteCkProjectById(Long ckProjectId) {
boolean b = Db.removeById(ckProjectId, CkProject.class);
if (!b) {
throw new MessageException();
}
}
@Override
public List<CkProjectDetailTableVo> ckProjectDetail(Long ckProjectId) {
return ckProjectMapper.ckProjectDetail(ckProjectId);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void saveOrUpdateCkGroup(CkGroupSaveOrUpdateParams params) {
boolean b = Db.saveOrUpdate(BeanUtil.copyProperties(params, CkGroup.class));
if (!b) {
throw new MessageException();
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void saveOrUpdateCkItem(CkItemSaveOrUpdateParams params) {
boolean b = Db.saveOrUpdate(BeanUtil.copyProperties(params, CkItem.class));
if (!b) {
throw new MessageException();
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void saveOrUpdateCkStandard(CkStandardSaveOrUpdateParams params) {
boolean b = Db.saveOrUpdate(BeanUtil.copyProperties(params, CkStandard.class));
if (!b) {
throw new MessageException();
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void submitAssessmentRecord(AssessmentRecordParams params) {

View File

@ -1,9 +1,9 @@
package com.changhu.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.changhu.mapper.CkAssessmentRecordDetailsMapper;
import com.changhu.pojo.entity.CkAssessmentRecordDetails;
import com.changhu.service.CkAssessmentRecordDetailsService;
import com.changhu.module.assessmentCriteria.mapper.CkAssessmentRecordDetailsMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecordDetails;
import com.changhu.module.assessmentCriteria.service.CkAssessmentRecordDetailsService;
import org.springframework.stereotype.Service;
/**

View File

@ -1,21 +1,22 @@
package com.changhu.module.superManagement.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.utils.UserUtil;
import com.changhu.module.superManagement.mapper.AssessmentCriteriaMapper;
import com.changhu.module.superManagement.mapper.AssessmentRecordMapper;
import com.changhu.module.superManagement.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.superManagement.pojo.vo.AssessmentRecordDetailVo;
import com.changhu.module.superManagement.pojo.vo.AssessmentRecordPagerVo;
import com.changhu.module.superManagement.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.superManagement.service.AssessmentRecordService;
import com.changhu.pojo.entity.CkAssessmentRecord;
import com.changhu.pojo.entity.CkAssessmentRecordDetails;
import com.changhu.module.assessmentCriteria.mapper.CkAssessmentRecordMapper;
import com.changhu.module.assessmentCriteria.mapper.CkProjectMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecord;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecordDetails;
import com.changhu.module.assessmentCriteria.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordDetailVo;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordPagerVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectDetailTableVo;
import com.changhu.module.assessmentCriteria.service.CkAssessmentRecordService;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import org.springframework.beans.factory.annotation.Autowired;
@ -24,25 +25,22 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author 20252
* @createTime 2024/11/22 下午3:05
* @desc AssessmentRecordServiceImpl...
* ck_assessment_record (考核记录) 服务实现类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Service
public class AssessmentRecordServiceImpl implements AssessmentRecordService {
public class CkAssessmentRecordServiceImpl extends ServiceImpl<CkAssessmentRecordMapper, CkAssessmentRecord> implements CkAssessmentRecordService {
@Autowired
private AssessmentCriteriaMapper assessmentCriteriaMapper;
@Autowired
private AssessmentRecordMapper assessmentRecordMapper;
private CkProjectMapper ckProjectMapper;
@Override
public Page<AssessmentRecordPagerVo> pager(PageParams<AssessmentRecordPagerQueryParams, AssessmentRecordPagerVo> queryParams) {
if (UserType.MANAGEMENT_POLICE.equals(UserUtil.getUserType())) {
return assessmentRecordMapper.pager(queryParams.getPage(), UserUtil.getUnitId(), queryParams.getParams());
return baseMapper.pager(queryParams.getPage(), UserUtil.getUnitId(), queryParams.getParams());
}
return assessmentRecordMapper.pager(queryParams.getPage(), null, queryParams.getParams());
return baseMapper.pager(queryParams.getPage(), null, queryParams.getParams());
}
@Override
@ -52,7 +50,7 @@ public class AssessmentRecordServiceImpl implements AssessmentRecordService {
.oneOpt()
.orElseThrow(() -> new MessageException(ResultCode.DATA_NOT_FOUND));
List<CkProjectDetailTableVo> ckProjectDetailTableVos = assessmentCriteriaMapper.ckProjectDetail(ckAssessmentRecord.getCkProjectId());
List<CkProjectDetailTableVo> ckProjectDetailTableVos = ckProjectMapper.ckProjectDetail(ckAssessmentRecord.getCkProjectId());
List<Long> assessmentRecordDetailCkStandardIds = Db.lambdaQuery(CkAssessmentRecordDetails.class)
.select(CkAssessmentRecordDetails::getCkStandardId)

View File

@ -1,9 +1,9 @@
package com.changhu.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.changhu.mapper.CkGroupMapper;
import com.changhu.pojo.entity.CkGroup;
import com.changhu.service.CkGroupService;
import com.changhu.module.assessmentCriteria.mapper.CkGroupMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.CkGroup;
import com.changhu.module.assessmentCriteria.service.CkGroupService;
import org.springframework.stereotype.Service;
/**

View File

@ -1,9 +1,9 @@
package com.changhu.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.changhu.mapper.CkItemMapper;
import com.changhu.pojo.entity.CkItem;
import com.changhu.service.CkItemService;
import com.changhu.module.assessmentCriteria.mapper.CkItemMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.CkItem;
import com.changhu.module.assessmentCriteria.service.CkItemService;
import org.springframework.stereotype.Service;
/**

View File

@ -1,9 +1,9 @@
package com.changhu.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.changhu.mapper.CkProjectMapper;
import com.changhu.pojo.entity.CkProject;
import com.changhu.service.CkProjectService;
import com.changhu.module.assessmentCriteria.mapper.CkProjectMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.CkProject;
import com.changhu.module.assessmentCriteria.service.CkProjectService;
import org.springframework.stereotype.Service;
/**

View File

@ -1,9 +1,9 @@
package com.changhu.service.impl;
package com.changhu.module.assessmentCriteria.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.changhu.mapper.CkStandardMapper;
import com.changhu.pojo.entity.CkStandard;
import com.changhu.service.CkStandardService;
import com.changhu.module.assessmentCriteria.mapper.CkStandardMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.CkStandard;
import com.changhu.module.assessmentCriteria.service.CkStandardService;
import org.springframework.stereotype.Service;
/**

View File

@ -1,4 +1,4 @@
package com.changhu.controller;
package com.changhu.module.management.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.annotation.CheckUserType;
@ -6,10 +6,10 @@ import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.pojo.params.EnterprisesUnitSaveOrUpdateParams;
import com.changhu.pojo.queryParams.EnterprisesUnitPagerQueryParams;
import com.changhu.pojo.vo.EnterprisesUnitPagerVo;
import com.changhu.service.EnterprisesUnitService;
import com.changhu.module.management.pojo.params.EnterprisesUnitSaveOrUpdateParams;
import com.changhu.module.management.pojo.queryParams.EnterprisesUnitPagerQueryParams;
import com.changhu.module.management.pojo.vo.EnterprisesUnitPagerVo;
import com.changhu.module.management.service.EnterprisesUnitService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
@ -27,8 +27,7 @@ import java.util.List;
*/
@Tag(name = "企事业单位")
@JsonBody
@RequestMapping("/eu")
@RestController
@RequestMapping("/enterprisesUnit")
public class EnterprisesUnitController {
@Autowired
@ -42,14 +41,14 @@ public class EnterprisesUnitController {
}
@Operation(summary = "新增或保存")
@PostMapping("/add_upd")
@PostMapping("/saveOrUpdate")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SUPER})
public void saveOrUpdate(@RequestBody @Valid EnterprisesUnitSaveOrUpdateParams params) {
enterprisesUnitService.saveOrUpdate(params);
}
@Operation(summary = "根据id删除")
@DeleteMapping("/del_id")
@DeleteMapping("/deleteById")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SUPER})
public void deleteById(@RequestParam @Schema(description = "企事业单位id") Long enterprisesUnitId) {
boolean b = enterprisesUnitService.removeById(enterprisesUnitId);
@ -59,7 +58,7 @@ public class EnterprisesUnitController {
}
@Operation(summary = "根据行政区划编码查询下面的企事业单位")
@PostMapping("/list_ad_codes")
@PostMapping("/queryListByAdministrativeDivisionCodes")
public List<SelectNodeVo<Long>> queryListByAdministrativeDivisionCodes(@RequestBody @Schema(description = "行政区划编码") List<String> administrativeDivisionCodes) {
return enterprisesUnitService.queryListByAdministrativeDivisionCodes(administrativeDivisionCodes);
}

View File

@ -1,16 +1,16 @@
package com.changhu.controller;
package com.changhu.module.management.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.IsWhiteList;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.pojo.params.CheckStatusParams;
import com.changhu.pojo.params.UnitDisableOrEnableParams;
import com.changhu.pojo.vo.UnitCheckStatusVo;
import com.changhu.pojo.vo.UnitMiniProgramUserPagerQueryParams;
import com.changhu.pojo.vo.UnitMiniProgramUserPagerVo;
import com.changhu.service.ManagementService;
import com.changhu.module.management.pojo.params.IndexCheckPassParams;
import com.changhu.module.management.pojo.params.IndexCheckStatusParams;
import com.changhu.module.management.pojo.params.IndexDisableOrEnableParams;
import com.changhu.module.management.pojo.queryParams.UnitMiniProgramUserPagerQueryParams;
import com.changhu.module.management.pojo.vo.UnitCheckStatusVo;
import com.changhu.module.management.pojo.vo.UnitMiniProgramUserPagerVo;
import com.changhu.module.management.service.ManagementService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -19,28 +19,40 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author 20252
* @createTime 2024/11/22 上午9:03
* @desc ManagementController...
* @createTime 2024/9/2 上午9:48
* @desc IndexController...
*/
@Tag(name = "后台-通用接口")
@JsonBody
@RequestMapping("/management")
@RestController
public class ManagementController {
@Autowired
private ManagementService managementService;
@Operation(summary = "审核通过")
@PostMapping("/checkPass")
@CheckUserType(userTypes = UserType.MANAGEMENT_SUPER)
public void checkPass(@RequestBody @Valid IndexCheckPassParams params) {
managementService.checkPass(params);
}
@Operation(summary = "获取审核状态")
@PostMapping("/getCheckStatus")
@IsWhiteList
public UnitCheckStatusVo getCheckStatus(@RequestBody @Valid CheckStatusParams params) {
public UnitCheckStatusVo getCheckStatus(@RequestBody @Valid IndexCheckStatusParams params) {
return managementService.getCheckStatus(params);
}
@Operation(summary = "启用或禁用状态")
@PostMapping("/disableOrEnable")
@CheckUserType(userTypes = UserType.MANAGEMENT_SUPER)
public void disableOrEnable(@RequestBody @Valid IndexDisableOrEnableParams params) {
managementService.disableOrEnable(params);
}
@Operation(summary = "查询单位下的小程序用户")
@PostMapping("/miniProgramUserPager")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SECURITY})
@ -51,14 +63,14 @@ public class ManagementController {
@Operation(summary = "审核通过小程序用户")
@PostMapping("/passMiniProgramUser")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SECURITY})
public void passMiniProgramUser(@RequestBody @Valid UnitDisableOrEnableParams params) {
public void passMiniProgramUser(@RequestBody @Valid IndexDisableOrEnableParams params) {
managementService.passMiniProgramUser(params);
}
@Operation(summary = "禁用或启用小程序用户")
@PostMapping("/disableOrEnableMiniProgramUser")
@CheckUserType(userTypes = {UserType.MANAGEMENT_POLICE, UserType.MANAGEMENT_SECURITY})
public void disableOrEnableMiniProgramUser(@RequestBody @Valid UnitDisableOrEnableParams params) {
public void disableOrEnableMiniProgramUser(@RequestBody @Valid IndexDisableOrEnableParams params) {
managementService.disableOrEnableMiniProgramUser(params);
}
}

View File

@ -0,0 +1,51 @@
package com.changhu.module.management.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.module.management.pojo.params.ManagementPoliceUserSaveOrUpdateParams;
import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams;
import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo;
import com.changhu.module.management.service.PoliceService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author 20252
* @createTime 2024/9/11 上午9:39
* @desc PoliceController...
*/
@Tag(name = "后台-公安")
@JsonBody
@RequestMapping("/management/police")
@CheckUserType(userTypes = UserType.MANAGEMENT_POLICE)
public class PoliceController {
@Autowired
private PoliceService policeService;
@Operation(summary = "新增或保存后台用户")
@PostMapping("/user/saveOrUpdate")
public void userSaveOrUpdate(@RequestBody @Valid ManagementPoliceUserSaveOrUpdateParams params) {
policeService.userSaveOrUpdate(params);
}
@Operation(summary = "分页查询后台用户")
@PostMapping("/user/pager")
public Page<ManagementPoliceUnitUserPagerVo> userPager(@RequestBody PageParams<ManagementPoliceUnitUserPagerQueryParams, ManagementPoliceUnitUserPagerVo> queryParams) {
return policeService.userPager(queryParams);
}
@Operation(summary = "根据id删除后台用户")
@DeleteMapping("/user/deleteById")
public void userDeleteById(@RequestParam @Schema(description = "后台公安用户id") Long managementPoliceUnitUserId) {
policeService.userDeleteById(managementPoliceUnitUserId);
}
}

View File

@ -0,0 +1,59 @@
package com.changhu.module.management.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.module.management.pojo.params.ManagementSecurityUnitUserSaveOrUpdateParams;
import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams;
import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo;
import com.changhu.module.management.service.SecurityService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author 20252
* @createTime 2024/9/11 上午9:39
* @desc SecurityController...
*/
@Tag(name = "后台-保安")
@JsonBody
@RequestMapping("/management/security")
@CheckUserType(userTypes = UserType.MANAGEMENT_SECURITY)
public class SecurityController {
@Autowired
private SecurityService securityService;
@Operation(summary = "新增或修改后台用户")
@PostMapping("/user/saveOrUpdate")
public void userSaveOrUpdate(@RequestBody @Valid ManagementSecurityUnitUserSaveOrUpdateParams saveOrUpdateParams) {
securityService.userSaveOrUpdate(saveOrUpdateParams);
}
@Operation(summary = "分页查询后台用户")
@PostMapping("/user/pager")
public Page<ManagementSecurityUnitUserPagerVo> userPager(@RequestBody PageParams<ManagementSecurityUnitUserPagerQueryParams, ManagementSecurityUnitUserPagerVo> queryParams) {
return securityService.userPager(queryParams);
}
@Operation(summary = "根据id删除后台用户")
@DeleteMapping("/user/deleteById")
public void userDeleteById(@RequestParam @Schema(description = "后台保安用户id") Long managementSecurityUnitUserId) {
securityService.userDeleteById(managementSecurityUnitUserId);
}
@Operation(summary = "查询单位下的项目经理")
@GetMapping("/listProjectManager")
public List<SelectNodeVo<Long>> listProjectManager() {
return securityService.listProjectManager();
}
}

View File

@ -1,16 +1,14 @@
package com.changhu.module.securityManagement.controller;
package com.changhu.module.management.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.exception.MessageException;
import com.changhu.module.securityManagement.pojo.params.ServiceProjectSaveOrUpdateParams;
import com.changhu.module.securityManagement.pojo.queryParams.ServiceProjectPagerQueryParams;
import com.changhu.module.securityManagement.pojo.vo.ServiceProjectPagerVo;
import com.changhu.module.securityManagement.service.Service_ProjectService;
import com.changhu.pojo.entity.ServiceProject;
import com.changhu.module.management.pojo.params.ServiceProjectSaveOrUpdateParams;
import com.changhu.module.management.pojo.queryParams.ServiceProjectPagerQueryParams;
import com.changhu.module.management.pojo.vo.ServiceProjectPagerVo;
import com.changhu.module.management.service.ServiceProjectService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -19,35 +17,34 @@ import org.springframework.web.bind.annotation.*;
/**
* @author 20252
* @createTime 2024/11/22 上午10:19
* @createTime 2024/9/5 上午11:09
* @desc ServiceProjectController...
*/
@Tag(name = "保安后台-服务项目管理")
@Tag(name = "服务项目")
@JsonBody
@RequestMapping("/m3/sp")
@RestController("securityServiceProjectManagement")
@RequestMapping("/serviceProject")
@CheckUserType(userTypes = UserType.MANAGEMENT_SECURITY)
public class ServiceProjectController {
@Autowired
private Service_ProjectService service_projectService;
private ServiceProjectService serviceProjectService;
@Operation(summary = "分页查询")
@PostMapping("/pager")
public Page<ServiceProjectPagerVo> pager(@RequestBody PageParams<ServiceProjectPagerQueryParams, ServiceProjectPagerVo> queryParams) {
return service_projectService.pager(queryParams);
return serviceProjectService.pager(queryParams);
}
@Operation(summary = "新增或者保存")
@PostMapping("/add_upd")
@PostMapping("/saveOrUpdate")
public void saveOrUpdate(@RequestBody ServiceProjectSaveOrUpdateParams params) {
service_projectService.saveOrUpdate(params);
serviceProjectService.saveOrUpdate(params);
}
@Operation(summary = "根据id删除")
@DeleteMapping("/del_id")
@DeleteMapping("/deleteById")
public void deleteById(@RequestParam Long serviceProjectId) {
boolean b = Db.removeById(serviceProjectId, ServiceProject.class);
boolean b = serviceProjectService.removeById(serviceProjectId);
if (!b) {
throw new MessageException();
}

View File

@ -0,0 +1,54 @@
package com.changhu.module.management.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.module.management.pojo.params.ManagementSuperUserSaveOrUpdateParams;
import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams;
import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams;
import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo;
import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo;
import com.changhu.module.management.service.SuperService;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* @author 20252
* @createTime 2024/9/11 上午9:38
* @desc ManagementSuperController...
*/
@Tag(name = "超级后台")
@JsonBody
@RequestMapping("/management/super")
@CheckUserType(userTypes = UserType.MANAGEMENT_SUPER)
public class SuperController {
@Autowired
private SuperService superService;
@Operation(summary = "新增或保存后台用户")
@PostMapping("/saveOrUpdateUser")
public void saveOrUpdateUser(@RequestBody @Valid ManagementSuperUserSaveOrUpdateParams params) {
superService.saveOrUpdateUser(params);
}
@Operation(summary = "公安单位分页查询")
@PostMapping("/policeUnit/pager")
public Page<PoliceUnitPagerVo> policeUnitPager(@RequestBody PageParams<PoliceUnitPagerQueryParams, PoliceUnitPagerVo> queryParams) {
return superService.policeUnitPager(queryParams);
}
@Operation(summary = "保安单位分页查询")
@PostMapping("/securityUnit/pager")
public Page<SecurityUnitPagerVo> securityUnitPager(@RequestBody PageParams<SecurityUnitPagerQueryParams, SecurityUnitPagerVo> queryParams) {
return superService.securityUnitPager(queryParams);
}
}

View File

@ -1,8 +1,8 @@
package com.changhu.strategy;
package com.changhu.module.management.enums;
import com.changhu.strategy.handler.unitOptType.AbstractUnitTypeHandler;
import com.changhu.strategy.handler.unitOptType.PoliceUnitTypeHandler;
import com.changhu.strategy.handler.unitOptType.SecurityUnitTypeHandler;
import com.changhu.module.management.enums.handler.AbstractUnitTypeHandler;
import com.changhu.module.management.enums.handler.PoliceUnitTypeHandler;
import com.changhu.module.management.enums.handler.SecurityUnitTypeHandler;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@ -1,7 +1,7 @@
package com.changhu.strategy.handler.unitOptType;
package com.changhu.module.management.enums.handler;
import cn.hutool.extra.spring.SpringUtil;
import com.changhu.pojo.vo.UnitCheckStatusVo;
import com.changhu.module.management.pojo.vo.UnitCheckStatusVo;
import org.springframework.transaction.PlatformTransactionManager;
/**

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.unitOptType;
package com.changhu.module.management.enums.handler;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
@ -7,13 +7,13 @@ import com.changhu.common.db.enums.*;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.utils.UserUtil;
import com.changhu.pojo.entity.ManagementPoliceUnitUser;
import com.changhu.pojo.entity.MiniProgramUser;
import com.changhu.pojo.entity.PoliceUnit;
import com.changhu.pojo.vo.UnitCheckStatusVo;
import com.changhu.service.ManagementPoliceUnitUserService;
import com.changhu.service.MiniProgramUserService;
import com.changhu.service.PoliceUnitService;
import com.changhu.module.management.pojo.entity.ManagementPoliceUnitUser;
import com.changhu.module.management.pojo.entity.PoliceUnit;
import com.changhu.module.management.pojo.vo.UnitCheckStatusVo;
import com.changhu.module.management.service.ManagementPoliceUnitUserService;
import com.changhu.module.management.service.PoliceUnitService;
import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser;
import com.changhu.module.miniProgram.service.MiniProgramUserService;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.TransactionStatus;

View File

@ -1,4 +1,4 @@
package com.changhu.strategy.handler.unitOptType;
package com.changhu.module.management.enums.handler;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
@ -7,13 +7,13 @@ import com.changhu.common.db.enums.*;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.utils.UserUtil;
import com.changhu.pojo.entity.ManagementSecurityUnitUser;
import com.changhu.pojo.entity.MiniProgramUser;
import com.changhu.pojo.entity.SecurityUnit;
import com.changhu.pojo.vo.UnitCheckStatusVo;
import com.changhu.service.ManagementSecurityUnitUserService;
import com.changhu.service.MiniProgramUserService;
import com.changhu.service.SecurityUnitService;
import com.changhu.module.management.pojo.entity.ManagementSecurityUnitUser;
import com.changhu.module.management.pojo.entity.SecurityUnit;
import com.changhu.module.management.pojo.vo.UnitCheckStatusVo;
import com.changhu.module.management.service.ManagementSecurityUnitUserService;
import com.changhu.module.management.service.SecurityUnitService;
import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser;
import com.changhu.module.miniProgram.service.MiniProgramUserService;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.TransactionStatus;

View File

@ -1,10 +1,10 @@
package com.changhu.mapper;
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.pojo.entity.EnterprisesUnit;
import com.changhu.pojo.queryParams.EnterprisesUnitPagerQueryParams;
import com.changhu.pojo.vo.EnterprisesUnitPagerVo;
import com.changhu.module.management.pojo.entity.EnterprisesUnit;
import com.changhu.module.management.pojo.queryParams.EnterprisesUnitPagerQueryParams;
import com.changhu.module.management.pojo.vo.EnterprisesUnitPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

View File

@ -0,0 +1,28 @@
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.management.pojo.entity.ManagementPoliceUnitUser;
import com.changhu.module.management.pojo.queryParams.ManagementPoliceUnitUserPagerQueryParams;
import com.changhu.module.management.pojo.vo.ManagementPoliceUnitUserPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* management_police_user (后台-公安单位用户表) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface ManagementPoliceUnitUserMapper extends BaseMapper<ManagementPoliceUnitUser> {
/**
* 分页查询
*
* @param page 分页参数
* @param params 查询参数
* @return 结果
*/
Page<ManagementPoliceUnitUserPagerVo> pager(@Param("page") Page<ManagementPoliceUnitUserPagerVo> page,
@Param("params") ManagementPoliceUnitUserPagerQueryParams params);
}

View File

@ -0,0 +1,28 @@
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.management.pojo.entity.ManagementSecurityUnitUser;
import com.changhu.module.management.pojo.queryParams.ManagementSecurityUnitUserPagerQueryParams;
import com.changhu.module.management.pojo.vo.ManagementSecurityUnitUserPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* management_security_unit_user (后台-保安单位用户表) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface ManagementSecurityUnitUserMapper extends BaseMapper<ManagementSecurityUnitUser> {
/**
* 分页查询
*
* @param page 分页参数
* @param params 查询参数
* @return 结果
*/
Page<ManagementSecurityUnitUserPagerVo> pager(@Param("page") Page<ManagementSecurityUnitUserPagerVo> page,
@Param("params") ManagementSecurityUnitUserPagerQueryParams params);
}

View File

@ -1,7 +1,7 @@
package com.changhu.mapper;
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.changhu.pojo.entity.ManagementSuperUser;
import com.changhu.module.management.pojo.entity.ManagementSuperUser;
import org.apache.ibatis.annotations.Mapper;
/**

View File

@ -0,0 +1,28 @@
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.management.pojo.entity.PoliceUnit;
import com.changhu.module.management.pojo.queryParams.PoliceUnitPagerQueryParams;
import com.changhu.module.management.pojo.vo.PoliceUnitPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* police_unit (公安单位) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface PoliceUnitMapper extends BaseMapper<PoliceUnit> {
/**
* 分页查询
*
* @param page 分页参数
* @param params 查询参数
* @return 结果
*/
Page<PoliceUnitPagerVo> pager(@Param("page") Page<PoliceUnitPagerVo> page,
@Param("params") PoliceUnitPagerQueryParams params);
}

View File

@ -0,0 +1,28 @@
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.management.pojo.entity.SecurityUnit;
import com.changhu.module.management.pojo.queryParams.SecurityUnitPagerQueryParams;
import com.changhu.module.management.pojo.vo.SecurityUnitPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* security_unit (保安单位) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface SecurityUnitMapper extends BaseMapper<SecurityUnit> {
/**
* 分页查询
*
* @param page 分页对象
* @param params 查询参数
* @return 结果
*/
Page<SecurityUnitPagerVo> pager(@Param("page") Page<SecurityUnitPagerVo> page,
@Param("params") SecurityUnitPagerQueryParams params);
}

View File

@ -0,0 +1,48 @@
package com.changhu.module.management.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.management.pojo.entity.ServiceProject;
import com.changhu.module.management.pojo.queryParams.ServiceProjectPagerQueryParams;
import com.changhu.module.management.pojo.vo.ServiceProjectPagerVo;
import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo;
import com.changhu.pojo.dto.ServiceProjectDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* service_project (服务项目) 固化类
* author: luozhun
* desc 由groovy脚本自动生成
*/
@Mapper
public interface ServiceProjectMapper extends BaseMapper<ServiceProject> {
/**
* 分页查询
*
* @param page 分页对象
* @param params 查询参数
* @return 结果
*/
Page<ServiceProjectPagerVo> pager(@Param("page") Page<ServiceProjectPagerVo> page,
@Param("params") ServiceProjectPagerQueryParams params);
/**
* 获取服务项目
*
* @return 服务项目列表
*/
List<IndexServiceProjectListVo> getServiceProjectList(@Param("policeUnitId") Long policeUnitId,
@Param("projectManagerMiniProgramUserId") Long projectManagerMiniProgramUserId);
/**
* 获取企事业单位下的服务项目
*
* @param enterprisesUnitId 企事业单位id
* @return 服务项目列表
*/
List<ServiceProjectDTO> getServiceProjectByEnterprisesUnitId(@Param("enterprisesUnitId") Long enterprisesUnitId);
}

View File

@ -1,10 +1,10 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.pojo.model.ContactPersonInfo;
import com.changhu.module.management.pojo.model.ContactPersonInfo;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.IsEnable;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.IsEnable;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.IsEnable;

View File

@ -1,11 +1,11 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler;
import com.changhu.common.db.enums.CheckStatus;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.pojo.model.ContactPersonInfo;
import com.changhu.module.management.pojo.model.ContactPersonInfo;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;

View File

@ -1,11 +1,11 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler;
import com.changhu.common.db.enums.CheckStatus;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.pojo.model.LegalPersonInfo;
import com.changhu.module.management.pojo.model.LegalPersonInfo;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.entity;
package com.changhu.module.management.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.IsOrNot;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.model;
package com.changhu.module.management.pojo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

View File

@ -1,4 +1,4 @@
package com.changhu.pojo.model;
package com.changhu.module.management.pojo.model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@ -1,7 +1,7 @@
package com.changhu.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.pojo.model.ContactPersonInfo;
import com.changhu.module.management.pojo.model.ContactPersonInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;

View File

@ -1,6 +1,6 @@
package com.changhu.module.superManagement.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.strategy.UnitOptType;
import com.changhu.module.management.enums.UnitOptType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -8,10 +8,10 @@ import lombok.Data;
/**
* @author 20252
* @createTime 2024/9/2 上午9:59
* @desc UnitCheckPassParams...
* @desc IndexCheckPassParams...
*/
@Data
public class UnitCheckPassParams {
public class IndexCheckPassParams {
@Schema(description = "审核数据的id")
@NotNull(message = "审核数据的id不能为空")
private Long checkDataId;

View File

@ -1,6 +1,6 @@
package com.changhu.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.strategy.UnitOptType;
import com.changhu.module.management.enums.UnitOptType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -8,10 +8,10 @@ import lombok.Data;
/**
* @author 20252
* @createTime 2024/9/2 上午10:51
* @desc CheckStatusParams...
* @desc IndexCheckStatusParams...
*/
@Data
public class CheckStatusParams {
public class IndexCheckStatusParams {
@Schema(description = "审核数据的唯一标识")
@NotNull(message = "唯一标识不能为空")

View File

@ -1,6 +1,6 @@
package com.changhu.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.strategy.UnitOptType;
import com.changhu.module.management.enums.UnitOptType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@ -8,10 +8,10 @@ import lombok.Data;
/**
* @author 20252
* @createTime 2024/9/3 上午9:28
* @desc UnitDisableOrEnableParams...
* @desc IndexDisableOrEnableParams...
*/
@Data
public class UnitDisableOrEnableParams {
public class IndexDisableOrEnableParams {
@Schema(description = "数据id")
@NotNull(message = "数据id不能为空")
private Long dataId;

View File

@ -1,4 +1,4 @@
package com.changhu.module.policeManagement.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.common.db.enums.Sex;
@ -11,10 +11,10 @@ import lombok.Data;
/**
* @author 20252
* @createTime 2024/9/4 下午3:04
* @desc UserSaveOrUpdateParams...
* @desc ManagementPoliceUserSaveOrUpdateParams...
*/
@Data
public class UserSaveOrUpdateParams {
public class ManagementPoliceUserSaveOrUpdateParams {
@Schema(description = "id")
private Long snowFlakeId;

View File

@ -1,4 +1,4 @@
package com.changhu.module.securityManagement.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.common.db.enums.Sex;
@ -11,10 +11,10 @@ import lombok.Data;
/**
* @author 20252
* @createTime 2024/9/3 上午10:26
* @desc UserSaveOrUpdateParams...
* @desc ManagementSecurityUnitUserSaveOrUpdateParams...
*/
@Data
public class UserSaveOrUpdateParams {
public class ManagementSecurityUnitUserSaveOrUpdateParams {
@Schema(description = "id")
private Long snowFlakeId;

View File

@ -1,4 +1,4 @@
package com.changhu.module.superManagement.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.common.validator.annotation.IsMobile;
import io.swagger.v3.oas.annotations.media.Schema;

View File

@ -1,4 +1,4 @@
package com.changhu.module.securityManagement.pojo.params;
package com.changhu.module.management.pojo.params;
import com.changhu.common.db.enums.IsOrNot;
import com.changhu.common.db.enums.ServiceProjectTwoType;

Some files were not shown because too many files have changed in this diff Show More