代码生成 指标分类

blade-service-api/logpm-supervise-api/pom.xml

@@ -10,7 +10,6 @@
         <version>3.2.0.RELEASE</version>
     </parent>
 
-    <groupId>org.springblade</groupId>
     <artifactId>logpm-supervise-api</artifactId>
     <version>3.2.0.RELEASE</version>
 

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;
+
+}

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;
+
+
+
+}

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;
+
+
+}

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;
+
+}

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java

@@ -0,0 +1,35 @@
+/*
+ *      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 org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 分类指标表 视图实体类
+ *
+ * @author logpm
+ * @since 2024-01-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClassifyVO extends ClassifyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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;
+}

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java

@@ -0,0 +1,12 @@
+package com.logpm.supervise.vo;
+
+import com.logpm.supervise.entity.IndicatorsEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class IndicatorsVO extends IndicatorsEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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;
+
+}

blade-service/logpm-supervise/pom.xml

@@ -34,6 +34,13 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-supervise-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
+
+
     </dependencies>
 
 

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java

@@ -0,0 +1,118 @@
+/*
+ *      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.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 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;
+
+/**
+ * 分类指标表 控制器
+ *
+ * @author logpm
+ * @since 2024-01-23
+ */
+@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<ClassifyVO> 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<IPage<ClassifyVO>> list(@ApiIgnore @RequestParam Map<String, Object> classify, Query query) {
+		IPage<ClassifyEntity> pages = classifyService.page(Condition.getPage(query), Condition.getQueryWrapper(classify, ClassifyEntity.class));
+		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)));
+	}
+
+
+}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java

@@ -0,0 +1,10 @@
+package com.logpm.supervise.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.supervise.entity.ClassifyEntity;
+
+public interface ClassifyMapper extends BaseMapper<ClassifyEntity> {
+
+
+
+}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.supervise.mapper.ClassifyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="classifyResultMap" type="com.logpm.supervise.entity.ClassifyEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="name" property="name"/>
+        <result column="description" property="description"/>
+        <result column="remark" property="remark"/>
+        <result column="p_id" property="pId"/>
+    </resultMap>
+
+
+
+
+
+</mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.java

@@ -0,0 +1,45 @@
+/*
+ *      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 java.util.List;
+
+/**
+ * 指标积分表 Mapper 接口
+ *
+ * @author logpm
+ * @since 2024-01-23
+ */
+public interface PointsMapper extends BaseMapper<PointsEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param points
+	 * @return
+	 */
+	List<PointsVO> selectPointsPage(IPage page, PointsVO points);
+
+
+
+}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/PointsMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.supervise.mapper.PointsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="pointsResultMap" type="com.logpm.supervise.entity.PointsEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="point" property="point"/>
+        <result column="classify_id" property="classifyId"/>
+    </resultMap>
+
+
+    <select id="selectPointsPage" resultMap="pointsResultMap">
+        select * from sup_points where is_deleted = 0
+    </select>
+
+
+
+
+</mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java

@@ -0,0 +1,35 @@
+/*
+ *      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.conditions.Wrapper;
+import com.logpm.supervise.entity.ClassifyEntity;
+import com.logpm.supervise.vo.ClassifyVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 分类指标表 服务类
+ *
+ * @author BladeX
+ * @since 2024-01-23
+ */
+public interface IClassifyService extends BaseService<ClassifyEntity> {
+
+
+}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IPointsService.java

@@ -0,0 +1,43 @@
+/*
+ *      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<PointsEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param points
+	 * @return
+	 */
+	IPage<PointsVO> selectPointsPage(IPage<PointsVO> page, PointsVO points);
+
+
+
+
+}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -0,0 +1,40 @@
+/*
+ *      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.logpm.supervise.entity.ClassifyEntity;
+import com.logpm.supervise.mapper.ClassifyMapper;
+import com.logpm.supervise.vo.ClassifyVO;
+import com.logpm.supervise.service.IClassifyService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 分类指标表 服务实现类
+ *
+ * @author BladeX
+ * @since 2024-01-23
+ */
+@Service
+public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, ClassifyEntity> implements IClassifyService {
+
+
+
+}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/PointsServiceImpl.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.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<PointsMapper, PointsEntity> implements IPointsService {
+
+	@Override
+	public IPage<PointsVO> selectPointsPage(IPage<PointsVO> page, PointsVO points) {
+		return page.setRecords(baseMapper.selectPointsPage(page, points));
+	}
+
+}

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<ClassifyEntity, ClassifyVO>  {
+
+	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;
+	}
+
+
+}

blade-service/logpm-supervise/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 8300
+  port: 8901
 
 #数据源配置
 #spring:
@@ -30,16 +30,16 @@ spring:
             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}
+          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.basic.slave.url}
-          username: ${blade.datasource.basic.slave.username}
-          password: ${blade.datasource.basic.slave.password}
+          url: ${blade.datasource.supervise.slave.url}
+          username: ${blade.datasource.supervise.slave.username}
+          password: ${blade.datasource.supervise.slave.password}
 

blade-service/logpm-supervise/src/main/resources/application.yml

@@ -10,23 +10,9 @@ swagger:
     - org.springblade
     - com.logpm
 
-#oss配置
-oss:
-  enabled: true
-  name: minio
-  tenant-mode: false
-  endpoint: http://8.137.14.82:9000
-  access-key: minio
-  secret-key: 123123123
-  bucket-name: bladex
-
-#blade配置
-blade:
-  #本地文件上传
-  file:
-    remote-mode: true
-    upload-domain: http://localhost:8999
-    remote-path: /usr/share/nginx/html
+
+
+
 
 logging:
   config: classpath:logback.xml