diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 91b0e0ce2..580a59b0f 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -68,4 +68,9 @@ public interface ModuleNameConstant { */ String APPLICATION_PATCH_NAME = "logpm-patch"+DEVAUTH; + /** + * 督察模块 + */ + String APPLICATION_SUPERVISE_NAME = "logpm-supervise"+DEVAUTH; + } diff --git a/blade-service-api/logpm-supervise-api/pom.xml b/blade-service-api/logpm-supervise-api/pom.xml new file mode 100644 index 000000000..cd2462bc2 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.2.0.RELEASE + + + logpm-supervise-api + 3.2.0.RELEASE + + + diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java new file mode 100644 index 000000000..30b0ae490 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java @@ -0,0 +1,17 @@ +package com.logpm.supervise.dto; + +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.entity.PointsEntity; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ClassifyDTO extends ClassifyEntity { + + private Integer isPid; + + private List pointsEntities = new ArrayList<>(); + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java new file mode 100644 index 000000000..5e7465f30 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java @@ -0,0 +1,30 @@ +package com.logpm.supervise.dto; + +import com.logpm.supervise.entity.IndicatorsEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Data +public class IndicatorsDTO extends IndicatorsEntity { + + @ApiModelProperty("当前页") + private Integer current; + @ApiModelProperty("每页的数量") + private Integer size; + private Long parentClassifyId; + + private String startDateStr; + private String endDateStr; + + //资源列表，图片和附件 + private List> resourceList; + + + private Date start; + private Date end; + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java new file mode 100644 index 000000000..4505c6003 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 分类指标表 实体类 + * + * @author BladeX + * @since 2024-01-23 + */ +@Data +@TableName("sup_classify") +@ApiModel(value = "Classify对象", description = "分类指标表") +@EqualsAndHashCode(callSuper = true) +public class ClassifyEntity extends TenantEntity { + + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String name; + /** + * 描述 + */ + @ApiModelProperty(value = "描述") + private String description; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + /** + * 是否是父指标 默认为0 + */ + @ApiModelProperty(value = "是否是父指标 默认为0 ") + private Long pId; + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsAnnexEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsAnnexEntity.java new file mode 100644 index 000000000..1f84f1881 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsAnnexEntity.java @@ -0,0 +1,33 @@ +package com.logpm.supervise.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("sup_indicators_annex") +@ApiModel(value = "IndicatorsAnnex对象", description = "考核附件表") +@EqualsAndHashCode(callSuper = true) +public class IndicatorsAnnexEntity extends TenantEntity { + + + @ApiModelProperty(value = "考核id") + private Long indicatorsId; + + + @ApiModelProperty(value = "资源地址") + private String url; + + + @ApiModelProperty(value = "资源名称") + private String name; + + @ApiModelProperty(value = "资源类型 1 图片 2 附件") + private Integer type; + + + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java new file mode 100644 index 000000000..a097557c2 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java @@ -0,0 +1,48 @@ +package com.logpm.supervise.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +@Data +@TableName("sup_indicators") +@ApiModel(value = "Indicators对象", description = "考核内容表") +@EqualsAndHashCode(callSuper = true) +public class IndicatorsEntity extends TenantEntity { + + + @ApiModelProperty(value = "考核部门") + private Long assessDept; + + @ApiModelProperty(value = "考核部门名称") + private String assessDeptName; + + @ApiModelProperty(value = "考核人") + private Long assessUserId; + + @ApiModelProperty(value = "考核人名称") + private String assessUserName; + + @ApiModelProperty(value = "考核指标") + private Long classifyId; + + @ApiModelProperty(value = "分数") + private int point; + + @ApiModelProperty(value = "考核备注") + private String remark; + + @ApiModelProperty(value = "指标状态 1 表示提交 2 表示审核 通过 3 表示审核失败") + private Integer indicatorsStatus; + + @ApiModelProperty(value = "是否存在异议 0 表示没有 1 表示存在") + private Integer isObjection; + + @ApiModelProperty(value = "异议备注") + private String objectionRemark; + + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/PointsEntity.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/PointsEntity.java new file mode 100644 index 000000000..4df51ae16 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/PointsEntity.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 分类指标表 实体类 + * + * @author logpm + * @since 2024-01-23 + */ +@Data +@TableName("sup_points") +@ApiModel(value = "Points对象", description = "分类指标分数区间表") +@EqualsAndHashCode(callSuper = true) +public class PointsEntity extends TenantEntity { + + /** + * 分数 + */ + @ApiModelProperty(value = "分数") + private Integer point; + + + /** + * 分数 + */ + @ApiModelProperty(value = "关联指标表") + private Long classifyId; + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java new file mode 100644 index 000000000..8784ea1bf --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.vo; + +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.entity.PointsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.ArrayList; +import java.util.List; + +/** + * 分类指标表 视图实体类 + * + * @author logpm + * @since 2024-01-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ClassifyVO extends ClassifyEntity { + private static final long serialVersionUID = 1L; + + private List pointsEntities = new ArrayList<>(); + + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsAnnexVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsAnnexVO.java new file mode 100644 index 000000000..e07ad76ee --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsAnnexVO.java @@ -0,0 +1,11 @@ +package com.logpm.supervise.vo; + +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class IndicatorsAnnexVO extends IndicatorsAnnexEntity { + private static final long serialVersionUID = 1L; +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java new file mode 100644 index 000000000..436e67133 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -0,0 +1,25 @@ +package com.logpm.supervise.vo; + +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import com.logpm.supervise.entity.IndicatorsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.ArrayList; +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +public class IndicatorsVO extends IndicatorsEntity { + private static final long serialVersionUID = 1L; + + private String classifyName; + + private Long parentClassifyId; + private String parentClassifyName; + + private List pictures = new ArrayList<>(); + + private List files = new ArrayList<>(); + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/PointsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/PointsVO.java new file mode 100644 index 000000000..67236bb26 --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/PointsVO.java @@ -0,0 +1,12 @@ +package com.logpm.supervise.vo; + +import com.logpm.supervise.entity.PointsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class PointsVO extends PointsEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java new file mode 100644 index 000000000..f07fff9da --- /dev/null +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java @@ -0,0 +1,15 @@ +package com.logpm.supervise.vo.api; + + +import com.logpm.supervise.entity.ClassifyEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@Data +@EqualsAndHashCode(callSuper = true) +public class ClassifyApiVO extends ClassifyEntity { + + private List children; +} diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index d9d8e999f..c9dd22fa4 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -35,6 +35,8 @@ logpm-old-project-api logpm-patch-api + + logpm-supervise-api diff --git a/blade-service/logpm-supervise/pom.xml b/blade-service/logpm-supervise/pom.xml new file mode 100644 index 000000000..1bf8527df --- /dev/null +++ b/blade-service/logpm-supervise/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.2.0.RELEASE + + + org.springblade + logpm-supervise + 3.2.0.RELEASE + + + + + org.springblade + blade-core-boot + + + org.springblade + blade-starter-swagger + + + org.springblade + blade-starter-excel + + + + org.springblade + blade-core-auto + provided + + + org.springblade + logpm-supervise-api + 3.2.0.RELEASE + + + + + + + + + + com.spotify + dockerfile-maven-plugin + + ${docker.username} + ${docker.password} + ${docker.registry.url}/${docker.namespace}/${project.artifactId} + ${project.version} + true + + target/${project.build.finalName}.jar + + false + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/SuperviseApplication.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/SuperviseApplication.java new file mode 100644 index 000000000..52e2666af --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/SuperviseApplication.java @@ -0,0 +1,21 @@ + +package com.logpm.supervise; + + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.cloud.client.BladeCloudApplication; +import org.springblade.core.launch.BladeApplication; + +/** + * Basic启动器 + * + * @author lmy + */ +@BladeCloudApplication +public class SuperviseApplication { + + public static void main(String[] args) { + BladeApplication.run(ModuleNameConstant.APPLICATION_SUPERVISE_NAME, SuperviseApplication.class, args); + } +} + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java new file mode 100644 index 000000000..923f924f6 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java @@ -0,0 +1,77 @@ +package com.logpm.supervise.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.service.IClassifyService; +import com.logpm.supervise.vo.ClassifyVO; +import com.logpm.supervise.vo.IndicatorsVO; +import com.logpm.supervise.vo.api.ClassifyApiVO; +import com.logpm.supervise.wrapper.ClassifyWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@RestController +@AllArgsConstructor +@RequestMapping("/classifyApi") +@Api(value = "分类指标表", tags = "分类指标表接口") +public class ClassifyApi { + + private final IClassifyService classifyService; + + + + @GetMapping("/classifyList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "小程序指标项列表", notes = "传入classify") + public R> classifyList() { + List detail = classifyService.selectClassifyList(); + return R.data(detail); + } + + + + + @PostMapping("/saveApiIndicators") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "小程序保存考核内容", notes = "传入classify") + public R saveApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) { + R r = classifyService.saveApiIndicators(instanceofDTO); + return r; + } + + + @GetMapping("/myApiIndicators") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "我的考核列表") + public R myApiIndicators(@RequestParam Map params,Query query) { + IPage page = Condition.getPage(query); + R r = classifyService.selectMyApiIndicators(params,page); + return r; + } + + @GetMapping("/myApiIndicatorsDetail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "我的考核列表") + public R myApiIndicatorsDetail(@RequestParam Long Id) { + R r = classifyService.myApiIndicatorsDetail(Id); + return r; + } + + + + + + + + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/config/SuperviseConfiguration.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/config/SuperviseConfiguration.java new file mode 100644 index 000000000..d8826a689 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/config/SuperviseConfiguration.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.config; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * 配置feign、mybatis包名、properties + * + * @author chaos + */ +@Configuration(proxyBeanMethods = false) +@ComponentScan({"org.springblade", "com.logpm"}) +@EnableFeignClients({"org.springblade", "com.logpm"}) +@MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"}) +@EnableConfigurationProperties(SuperviseConfiguration.class) +public class SuperviseConfiguration { + + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java new file mode 100644 index 000000000..f9cda8878 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java @@ -0,0 +1,252 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.supervise.dto.ClassifyDTO; +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.service.IClassifyService; +import com.logpm.supervise.vo.ClassifyVO; +import com.logpm.supervise.wrapper.ClassifyWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.validation.Valid; +import java.util.Map; +import java.util.Objects; + +/** + * 分类指标表 控制器 + * + * @author logpm + * @since 2024-01-23 + */ +@Slf4j +@RestController +@AllArgsConstructor +@RequestMapping("/classify") +@Api(value = "分类指标表", tags = "分类指标表接口") +public class ClassifyController extends BladeController { + + private final IClassifyService classifyService; + + /** + * 分类指标表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入classify") + public R detail(ClassifyEntity classify) { + ClassifyEntity detail = classifyService.getOne(Condition.getQueryWrapper(classify)); + return R.data(ClassifyWrapper.build().entityVO(detail)); + } + + /** + * 分类指标表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入classify") + public R> list(@ApiIgnore @RequestParam Map classify, Query query) { + IPage pages = classifyService.pageList(Condition.getPage(query), classify); + return R.data(ClassifyWrapper.build().pageVO(pages)); + } + + + /** + * 分类指标表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入classify") + public R save(@Valid @RequestBody ClassifyEntity classify) { + return R.status(classifyService.save(classify)); + } + + /** + * 分类指标表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入classify") + public R update(@Valid @RequestBody ClassifyEntity classify) { + return R.status(classifyService.updateById(classify)); + } + + /** + * 分类指标表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入classify") + public R submit(@Valid @RequestBody ClassifyEntity classify) { + return R.status(classifyService.saveOrUpdate(classify)); + } + + /** + * 分类指标表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(classifyService.deleteLogic(Func.toLongList(ids))); + } + + + @PostMapping("/addChild") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "添加指标", notes = "传入classify") + public R addChild(@RequestBody ClassifyDTO classifyDTO) { + String method = "##############addChild: "; + log.info(method+"添加指标 参数={}",classifyDTO); + + try{ + classifyService.addChild(classifyDTO); + return R.success("添加成功"); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + @PostMapping("/findChildDetail") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "查询子类详情", notes = "传入classify") + public R findChildDetail(@RequestBody ClassifyDTO classifyDTO) { + String method = "##############findChildDetail: "; + log.info(method+"添加指标 参数={}",classifyDTO); + + try{ + Long id = classifyDTO.getId(); + if(Objects.isNull(id)){ + log.warn(method+"id不能为空 id={}",id); + return R.fail(405,"id不能为空"); + } + + return classifyService.findChildDetail(classifyDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + @PostMapping("/updateChild") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "更新指标", notes = "传入classify") + public R updateChild(@RequestBody ClassifyDTO classifyDTO) { + String method = "##############updateChild: "; + log.info(method+"更新指标 参数={}",classifyDTO); + + try{ + + Long id = classifyDTO.getId(); + if(Objects.isNull(id)){ + log.warn(method+"id不能为空 id={}",id); + return R.fail(405,"id不能为空"); + } + + classifyService.updateChild(classifyDTO); + return R.success("更新成功"); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + @PostMapping("/selectParentCalssifyList") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "查询指标分类", notes = "传入indicatorsDTO") + public R selectParentCalssifyList(@RequestBody ClassifyDTO classifyDTO) { + String method = "##############selectParentCalssifyList: "; + log.info(method+"查询指标分类 参数={}",classifyDTO); + + try{ + + return classifyService.selectParentCalssifyList(classifyDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + @PostMapping("/selectChildCalssifyList") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "查询指标选项", notes = "传入indicatorsDTO") + public R selectChildCalssifyList(@RequestBody ClassifyDTO classifyDTO) { + String method = "##############selectChildCalssifyList: "; + log.info(method+"查询指标分类 参数={}",classifyDTO); + + try{ + + return classifyService.selectChildCalssifyList(classifyDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + @PostMapping("/selectPointList") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "查询指标选项", notes = "传入indicatorsDTO") + public R selectPointList(@RequestBody ClassifyDTO classifyDTO) { + String method = "##############selectPointList: "; + log.info(method+"查询指标选项 参数={}",classifyDTO); + + try{ + return classifyService.selectPointList(classifyDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java new file mode 100644 index 000000000..0609afad3 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java @@ -0,0 +1,95 @@ +package com.logpm.supervise.controller; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.service.IIndicatorsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.tool.api.R; +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; + +import java.util.Objects; + +@Slf4j +@RestController +@AllArgsConstructor +@RequestMapping("/classify") +@Api(value = "分类指标表", tags = "指标接口") +public class IndicatorsController { + + private final IIndicatorsService indicatorsService; + + @PostMapping("/findIndicatorsList") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "查询指标列表", notes = "传入indicatorsDTO") + public R findIndicatorsList(@RequestBody IndicatorsDTO indicatorsDTO) { + String method = "##############findIndicatorsList: "; + log.info(method+"添加指标 参数={}",indicatorsDTO); + + try{ + return indicatorsService.findIndicatorsList(indicatorsDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + @PostMapping("/findIndicatorsDetail") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "查询指标详情", notes = "传入indicatorsDTO") + public R findIndicatorsDetail(@RequestBody IndicatorsDTO indicatorsDTO) { + String method = "##############findIndicatorsDetail: "; + log.info(method+"查询指标详情 参数={}",indicatorsDTO); + + try{ + Long id = indicatorsDTO.getId(); + if(Objects.isNull(id)){ + log.warn(method+"指标id为空 id={}",id); + return R.fail(405,"指标id为空"); + } + + return indicatorsService.findIndicatorsDetail(indicatorsDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + @PostMapping("/updateIndicators") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "更新指标", notes = "传入indicatorsDTO") + public R updateIndicators(@RequestBody IndicatorsDTO indicatorsDTO) { + String method = "##############updateIndicators: "; + log.info(method+"更新指标 参数={}",indicatorsDTO); + + try{ + Long id = indicatorsDTO.getId(); + if(Objects.isNull(id)){ + log.warn(method+"指标id为空 id={}",id); + return R.fail(405,"指标id为空"); + } + + return indicatorsService.updateIndicators(indicatorsDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/launcher/BasicLauncherServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/launcher/BasicLauncherServiceImpl.java new file mode 100644 index 000000000..8e35a941d --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/launcher/BasicLauncherServiceImpl.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.launcher; + +import org.springblade.core.auto.service.AutoService; +import org.springblade.core.launch.constant.NacosConstant; +import org.springblade.core.launch.service.LauncherService; +import org.springblade.core.launch.utils.PropsUtil; +import org.springframework.boot.builder.SpringApplicationBuilder; + +import java.util.Properties; + +/** + * 启动参数拓展 + * + * @author Chill + */ +@AutoService(LauncherService.class) +public class BasicLauncherServiceImpl implements LauncherService { + + @Override + public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { + Properties props = System.getProperties(); + // 开启多数据源 + PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); + // 指定注册配置信息 + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId(appName, profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); + // 指定注册IP + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1"); + // 指定注册端口 + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200"); + // 自定义命名空间 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE); + // 自定义分组 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP); + } + + @Override + public int getOrder() { + return 20; + } +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java new file mode 100644 index 000000000..3a63c4543 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java @@ -0,0 +1,29 @@ +package com.logpm.supervise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.supervise.dto.ClassifyDTO; +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.vo.api.ClassifyApiVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ClassifyMapper extends BaseMapper { + + IPage pageList(IPage page, @Param("param") ClassifyDTO classifyDTO); + + List selectParentCalssifyList(@Param("param") ClassifyDTO classifyDTO); + + List selectChildCalssifyList(@Param("param") ClassifyDTO classifyDTO); + + + /** + * 查询指标项列表 + * @param pid + * @return + */ + List selectAllClassifyList(Long pid); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml new file mode 100644 index 000000000..d3aab6e88 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java new file mode 100644 index 000000000..91c5096d6 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.java @@ -0,0 +1,15 @@ +package com.logpm.supervise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface IndicatorsAnnexMapper extends BaseMapper { + + + List findListByIndicatorsIdAndType(@Param("id") Long id, @Param("type") int type); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml new file mode 100644 index 000000000..28c3ee5da --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java new file mode 100644 index 000000000..fbc16ad0d --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java @@ -0,0 +1,29 @@ +package com.logpm.supervise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.vo.IndicatorsVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; + +@Mapper +public interface IndicatorsMapper extends BaseMapper { + + + IPage pageList(IPage page, @Param("param") IndicatorsDTO indicatorsDTO); + + IndicatorsVO findIndicatorsDetail(@Param("id") Long id); + + /** + * 查询我的考核列表 + * @param page + * @param params + * @return + */ + Page selectMyApiIndicators(IPage page, Map params); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml new file mode 100644 index 000000000..4e9a28282 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.java new file mode 100644 index 000000000..adbae7d7d --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.supervise.entity.PointsEntity; +import com.logpm.supervise.vo.PointsVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 指标积分表 Mapper 接口 + * + * @author logpm + * @since 2024-01-23 + */ +public interface PointsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param points + * @return + */ + List selectPointsPage(IPage page, PointsVO points); + + + void removeByClassifyId(@Param("classifyId") Long classifyId); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.xml new file mode 100644 index 000000000..b7d9cf361 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + delete from sup_points + where classify_id = #{classifyId} + + + + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java new file mode 100644 index 000000000..aec0c6dec --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.supervise.dto.ClassifyDTO; +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.vo.IndicatorsVO; +import com.logpm.supervise.vo.api.ClassifyApiVO; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; + +import java.util.List; +import java.util.Map; + +/** + * 分类指标表 服务类 + * + * @author BladeX + * @since 2024-01-23 + */ +public interface IClassifyService extends BaseService { + + + IPage pageList(IPage page, Map classify); + + void addChild(ClassifyDTO classifyDTO); + + R findChildDetail(ClassifyDTO classifyDTO); + + void updateChild(ClassifyDTO classifyDTO); + + R selectParentCalssifyList(ClassifyDTO classifyDTO); + + R selectChildCalssifyList(ClassifyDTO classifyDTO); + + R selectPointList(ClassifyDTO classifyDTO); + + /** + * 查询指标项列表 + * @param classify + * @return + */ + List selectClassifyList(); + + /** + * API保存考核信息 + * @param instanceofDTO + * @return + */ + R saveApiIndicators(IndicatorsDTO instanceofDTO); + + /** + * 查询我的考核列表 + * @param params + * @return + */ + R selectMyApiIndicators(Map params, IPage page); + + /** + * 查询我的考核详情 + * @param id + * @return + */ + R myApiIndicatorsDetail(Long id); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsAnnexService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsAnnexService.java new file mode 100644 index 000000000..75d3d7e7f --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsAnnexService.java @@ -0,0 +1,10 @@ +package com.logpm.supervise.service; + +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +public interface IIndicatorsAnnexService extends BaseService { + List findListByIndicatorsIdAndType(Long id, int type); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java new file mode 100644 index 000000000..56174bd36 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java @@ -0,0 +1,15 @@ +package com.logpm.supervise.service; + +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.entity.IndicatorsEntity; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; + +public interface IIndicatorsService extends BaseService { + R findIndicatorsList(IndicatorsDTO indicatorsDTO); + + R findIndicatorsDetail(IndicatorsDTO indicatorsDTO); + + R updateIndicators(IndicatorsDTO indicatorsDTO); + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IPointsService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IPointsService.java new file mode 100644 index 000000000..be5aad926 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IPointsService.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.supervise.entity.PointsEntity; +import com.logpm.supervise.vo.PointsVO; +import org.springblade.core.mp.base.BaseService; + +/** + * 指标积分表 服务类 + * + * @author logpm + * @since 2024-01-23 + */ +public interface IPointsService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param points + * @return + */ + IPage selectPointsPage(IPage page, PointsVO points); + + + void removeByClassifyId(Long classifyId); +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java new file mode 100644 index 000000000..bbae5ba9b --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -0,0 +1,233 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.supervise.dto.ClassifyDTO; +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.entity.PointsEntity; +import com.logpm.supervise.mapper.ClassifyMapper; +import com.logpm.supervise.mapper.IndicatorsMapper; +import com.logpm.supervise.service.IClassifyService; +import com.logpm.supervise.service.IIndicatorsAnnexService; +import com.logpm.supervise.service.IIndicatorsService; +import com.logpm.supervise.service.IPointsService; +import com.logpm.supervise.vo.ClassifyVO; +import com.logpm.supervise.vo.IndicatorsVO; +import com.logpm.supervise.vo.api.ClassifyApiVO; +import com.logpm.supervise.wrapper.IndicatorsWrapper; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * 分类指标表 服务实现类 + * + * @author BladeX + * @since 2024-01-23 + */ +@Slf4j +@Service +@AllArgsConstructor +public class ClassifyServiceImpl extends BaseServiceImpl implements IClassifyService { + + private final IPointsService pointsService; + + private final IIndicatorsAnnexService indicatorsAnnexService; + + private final IIndicatorsService iIndicatorsService; + + private final IndicatorsMapper indicatorsMapper; + + + + @Override + public IPage pageList(IPage page, Map classify) { + Long pId = (Long) classify.get("pId"); + String name = (String) classify.get("name"); + + ClassifyDTO classifyDTO = new ClassifyDTO(); + classifyDTO.setPId(pId); + classifyDTO.setName(name); + + IPage pages = baseMapper.pageList(page,classifyDTO); + + return pages; + } + + @Override + public void addChild(ClassifyDTO classifyDTO) { + + ClassifyEntity classifyEntity = new ClassifyEntity(); + BeanUtil.copy(classifyDTO,classifyEntity); + save(classifyEntity); + + List pointsEntities = classifyDTO.getPointsEntities(); + for (PointsEntity pointsEntity : pointsEntities) { + pointsEntity.setClassifyId(classifyEntity.getId()); + } + pointsService.saveBatch(pointsEntities); + + } + + @Override + public R findChildDetail(ClassifyDTO classifyDTO) { + Long id = classifyDTO.getId(); + + ClassifyEntity classifyEntity = getById(id); + Long pId = classifyEntity.getPId(); + if(pId.equals(0L)){ + log.warn("#############findChildDetail：数据为指标分类数据"); + return R.fail(405,"数据为指标分类数据"); + } + + ClassifyVO classifyVO = new ClassifyVO(); + BeanUtil.copy(classifyEntity,classifyVO); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("classify_id",id) + .eq("is_deleted",0); + List list = pointsService.list(queryWrapper); + + classifyVO.setPointsEntities(list); + + return R.data(classifyVO); + } + + @Override + public void updateChild(ClassifyDTO classifyDTO) { + + Long id = classifyDTO.getId(); + + ClassifyEntity classifyEntity = getById(id); + classifyEntity.setName(classifyDTO.getName()); + classifyEntity.setDescription(classifyDTO.getDescription()); + classifyEntity.setRemark(classifyDTO.getRemark()); + classifyEntity.setPId(classifyDTO.getPId()); + updateById(classifyEntity); + + //先删除所有积分 + pointsService.removeByClassifyId(id); + + List pointsEntities = classifyDTO.getPointsEntities(); + for (PointsEntity pointsEntity : pointsEntities) { + pointsEntity.setClassifyId(classifyEntity.getId()); + } + pointsService.saveBatch(pointsEntities); + } + + @Override + public R selectParentCalssifyList(ClassifyDTO classifyDTO) { + List list = baseMapper.selectParentCalssifyList(classifyDTO); + return R.data(list); + } + + @Override + public R selectChildCalssifyList(ClassifyDTO classifyDTO) { + List list = baseMapper.selectChildCalssifyList(classifyDTO); + return R.data(list); + } + + @Override + public R selectPointList(ClassifyDTO classifyDTO) { + Long calssifyId = classifyDTO.getId(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("classify_id",calssifyId) + .eq("is_deleted",0); + List list = pointsService.list(queryWrapper); + + return R.data(list); + } + + @Override + public List selectClassifyList() { + Long pid = 0L; + List classifyEntities = getClassifyList(pid); + for (ClassifyApiVO classifyEntity : classifyEntities) { + List classifyList = getClassifyList(classifyEntity.getId()); + if (!Objects.isNull(classifyList)){ + classifyEntity.setChildren(classifyList); + } + } + return classifyEntities; + } + + @Override + @Transactional + public R saveApiIndicators(IndicatorsDTO instanceofDTO) { + if (Func.isNotEmpty(instanceofDTO.getResourceList())){ + //存在附件进行保存 + List> resourceList = instanceofDTO.getResourceList(); + for (Map map : resourceList) { + IndicatorsAnnexEntity indicatorsAnnexEntity = Func.copy(map, IndicatorsAnnexEntity.class); + indicatorsAnnexService.save(indicatorsAnnexEntity); + } + } + //保存考核内容 + IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class); + return R.status(iIndicatorsService.save(indicatorsEntity)); + } + + @Override + public R selectMyApiIndicators(Map params, IPage page) { + Long userId = AuthUtil.getUserId(); + Page indicatorsVOPage = indicatorsMapper.selectMyApiIndicators(page,params); + return R.data(indicatorsVOPage); + } + + @Override + public R myApiIndicatorsDetail(Long id) { + IndicatorsEntity indicatorsEntity = iIndicatorsService.getById(id); + //查询是否存在有附件 + List list = indicatorsAnnexService.list(Wrappers.query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id)); + IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity); + if (Func.isNotEmpty(list)){ + Map> resourceMap = list.stream().collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType)); + if (Func.isNotEmpty(resourceMap.get(1))){ + //存在图片资源 + indicatorsVO.setPictures(resourceMap.get(1)); + } + if (Func.isNotEmpty(resourceMap.get(2))){ + //存在附件资源 + indicatorsVO.setPictures(resourceMap.get(2)); + } + } + return R.data(indicatorsVO); + } + + private List getClassifyList(Long pid) { + return baseMapper.selectAllClassifyList(pid); + } +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsAnnexServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsAnnexServiceImpl.java new file mode 100644 index 000000000..7673e41df --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsAnnexServiceImpl.java @@ -0,0 +1,21 @@ +package com.logpm.supervise.service.impl; + +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import com.logpm.supervise.mapper.IndicatorsAnnexMapper; +import com.logpm.supervise.service.IIndicatorsAnnexService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@AllArgsConstructor +public class IndicatorsAnnexServiceImpl extends BaseServiceImpl implements IIndicatorsAnnexService { + @Override + public List findListByIndicatorsIdAndType(Long id, int type) { + return baseMapper.findListByIndicatorsIdAndType(id,type); + } +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java new file mode 100644 index 000000000..92ba67839 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java @@ -0,0 +1,89 @@ +package com.logpm.supervise.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.logpm.supervise.dto.IndicatorsDTO; +import com.logpm.supervise.entity.IndicatorsAnnexEntity; +import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.mapper.IndicatorsMapper; +import com.logpm.supervise.service.IIndicatorsAnnexService; +import com.logpm.supervise.service.IIndicatorsService; +import com.logpm.supervise.vo.IndicatorsVO; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.utils.CommonUtil; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.Objects; + +@Slf4j +@AllArgsConstructor +@Service +public class IndicatorsServiceImpl extends BaseServiceImpl implements IIndicatorsService { + + private final IIndicatorsAnnexService iIndicatorsAnnexService; + + @Override + public R findIndicatorsList(IndicatorsDTO indicatorsDTO) { + + IPage page = new Page<>(); + page.setCurrent(indicatorsDTO.getCurrent()); + page.setSize(indicatorsDTO.getSize()); + + String startDateStr = indicatorsDTO.getStartDateStr(); + String endDateStr = indicatorsDTO.getEndDateStr(); + + Date start = CommonUtil.getStartByDateStr(startDateStr); + Date end = CommonUtil.getEndByDateStr(endDateStr); + indicatorsDTO.setStart(start); + indicatorsDTO.setEnd(end); + + IPage pages = baseMapper.pageList(page,indicatorsDTO); + + + return R.data(pages); + } + + @Override + public R findIndicatorsDetail(IndicatorsDTO indicatorsDTO) { + + Long id = indicatorsDTO.getId(); + + IndicatorsVO indiactorsVO = baseMapper.findIndicatorsDetail(id); + + List pictures = iIndicatorsAnnexService.findListByIndicatorsIdAndType(id,1); + List files = iIndicatorsAnnexService.findListByIndicatorsIdAndType(id,2); + + indiactorsVO.setPictures(pictures); + indiactorsVO.setFiles(files); + + return R.data(indiactorsVO); + } + + @Override + public R updateIndicators(IndicatorsDTO indicatorsDTO) { + Long id = indicatorsDTO.getId(); + IndicatorsEntity indicatorsEntity = getById(id); + if(Objects.isNull(indicatorsEntity)){ + log.warn("###########updateIndicators: 指标信息不存在 id={}",id); + return R.fail(405,"指标信息不存在"); + } + + indicatorsEntity.setAssessDept(indicatorsDTO.getAssessDept()); + indicatorsEntity.setAssessDeptName(indicatorsDTO.getAssessDeptName()); + indicatorsEntity.setAssessUserId(indicatorsDTO.getAssessUserId()); + indicatorsEntity.setAssessUserName(indicatorsDTO.getAssessUserName()); + indicatorsEntity.setClassifyId(indicatorsDTO.getClassifyId()); + indicatorsEntity.setPoint(indicatorsDTO.getPoint()); + indicatorsEntity.setRemark(indicatorsDTO.getRemark()); + indicatorsEntity.setObjectionRemark(indicatorsDTO.getObjectionRemark()); + + updateById(indicatorsEntity); + return R.success("更新成功"); + } + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/PointsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/PointsServiceImpl.java new file mode 100644 index 000000000..c16358d62 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/PointsServiceImpl.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.supervise.entity.PointsEntity; +import com.logpm.supervise.mapper.PointsMapper; +import com.logpm.supervise.service.IPointsService; +import com.logpm.supervise.vo.PointsVO; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 指标积分表 服务实现类 + * + * @author logpm + * @since 2024-01-23 + */ +@Service +public class PointsServiceImpl extends BaseServiceImpl implements IPointsService { + + @Override + public IPage selectPointsPage(IPage page, PointsVO points) { + return page.setRecords(baseMapper.selectPointsPage(page, points)); + } + + @Override + public void removeByClassifyId(Long classifyId) { + baseMapper.removeByClassifyId(classifyId); + } + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/ClassifyWrapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/ClassifyWrapper.java new file mode 100644 index 000000000..72f341131 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/ClassifyWrapper.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.vo.ClassifyVO; +import java.util.Objects; + +/** + * 分类指标表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2024-01-23 + */ +public class ClassifyWrapper extends BaseEntityWrapper { + + public static ClassifyWrapper build() { + return new ClassifyWrapper(); + } + + @Override + public ClassifyVO entityVO(ClassifyEntity classify) { + ClassifyVO classifyVO = Objects.requireNonNull(BeanUtil.copy(classify, ClassifyVO.class)); + + //User createUser = UserCache.getUser(classify.getCreateUser()); + //User updateUser = UserCache.getUser(classify.getUpdateUser()); + //classifyVO.setCreateUserName(createUser.getName()); + //classifyVO.setUpdateUserName(updateUser.getName()); + + return classifyVO; + } + + +} diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/IndicatorsWrapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/IndicatorsWrapper.java new file mode 100644 index 000000000..c62f71751 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/IndicatorsWrapper.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.supervise.wrapper; + +import com.logpm.supervise.entity.ClassifyEntity; +import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.vo.ClassifyVO; +import com.logpm.supervise.vo.IndicatorsVO; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + +import java.util.Objects; + +/** + * 分类指标表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2024-01-23 + */ +public class IndicatorsWrapper extends BaseEntityWrapper { + + public static IndicatorsWrapper build() { + return new IndicatorsWrapper(); + } + + @Override + public IndicatorsVO entityVO(IndicatorsEntity indicatorsEntity) { + IndicatorsVO classifyVO = Objects.requireNonNull(BeanUtil.copy(indicatorsEntity, IndicatorsVO.class)); + return classifyVO; + } + + +} diff --git a/blade-service/logpm-supervise/src/main/resources/application-dev.yml b/blade-service/logpm-supervise/src/main/resources/application-dev.yml new file mode 100644 index 000000000..ea38e3d37 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/resources/application-dev.yml @@ -0,0 +1,45 @@ +#服务器端口 +server: + port: 8901 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + druid: + #通用校验配置 + validation-query: select 1 + #启用sql日志拦截器 + proxy-filters: + - sqlLogInterceptor + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.supervise.master.url} + username: ${blade.datasource.supervise.master.username} + password: ${blade.datasource.supervise.master.password} + slave: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.supervise.slave.url} + username: ${blade.datasource.supervise.slave.username} + password: ${blade.datasource.supervise.slave.password} + diff --git a/blade-service/logpm-supervise/src/main/resources/application-prod.yml b/blade-service/logpm-supervise/src/main/resources/application-prod.yml new file mode 100644 index 000000000..3ff547cac --- /dev/null +++ b/blade-service/logpm-supervise/src/main/resources/application-prod.yml @@ -0,0 +1,45 @@ +#服务器端口 +server: + port: 8300 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + druid: + #通用校验配置 + validation-query: select 1 + #启用sql日志拦截器 + proxy-filters: + - sqlLogInterceptor + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.master.url} + username: ${blade.datasource.basic.master.username} + password: ${blade.datasource.basic.master.password} + slave: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.slave.url} + username: ${blade.datasource.basic.slave.username} + password: ${blade.datasource.basic.slave.password} + diff --git a/blade-service/logpm-supervise/src/main/resources/application-test.yml b/blade-service/logpm-supervise/src/main/resources/application-test.yml new file mode 100644 index 000000000..3ce9c0d67 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/resources/application-test.yml @@ -0,0 +1,45 @@ +#服务器端口 +server: + port: 6001 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + druid: + #通用校验配置 + validation-query: select 1 + #启用sql日志拦截器 + proxy-filters: + - sqlLogInterceptor + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.master.url} + username: ${blade.datasource.basic.master.username} + password: ${blade.datasource.basic.master.password} + slave: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.slave.url} + username: ${blade.datasource.basic.slave.username} + password: ${blade.datasource.basic.slave.password} + diff --git a/blade-service/logpm-supervise/src/main/resources/application.yml b/blade-service/logpm-supervise/src/main/resources/application.yml new file mode 100644 index 000000000..2e77f4351 --- /dev/null +++ b/blade-service/logpm-supervise/src/main/resources/application.yml @@ -0,0 +1,25 @@ +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/logpm/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.logpm.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: + - org.springblade + - com.logpm + + + + + +logging: + config: classpath:logback.xml + + +spring: + main: + allow-circular-references: true + + diff --git a/blade-service/logpm-supervise/src/main/resources/logback.xml b/blade-service/logpm-supervise/src/main/resources/logback.xml new file mode 100644 index 000000000..7170050de --- /dev/null +++ b/blade-service/logpm-supervise/src/main/resources/logback.xml @@ -0,0 +1,40 @@ + + + + logback + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + + + ${log.path} + + ${log.path}.%d{yyyy-MM-dd}.zip + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n + + + + + + + + + + diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 7624a7b3a..83162614e 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -40,6 +40,8 @@ logpm-old-project logpm-patch + + logpm-supervise