代码优化提交

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DataDictionaryController.java

@@ -28,7 +28,7 @@ public class DataDictionaryController {
 
 	//@ImsPreAuth("eval:dataDictionary:view")
 	@GetMapping(value = "list")
-	public R list(@RequestParam(value = "id", required = false) String id,
+	public R list( @RequestParam(value = "id", required = false) String id,
 				  @RequestParam(value = "dataKey", required = false) String dataKey,
 				  @RequestParam(value = "keyName", required = false) String keyName,
 				  @RequestParam(value = "superKey", required = false) String superKey ) {

ims-service/ims-eval/src/main/java/com/ims/eval/controller/IndicatorController.java

@@ -1,22 +1,19 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.dao.result.R;
-import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.IIndicatorService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * <p>
- * 前端控制器
+ * 指标 前端控制器
  * </p>
  *
  * @author wang
@@ -32,31 +29,33 @@ public class IndicatorController {
 
 
 	/**
-	 *
-	 * @param id 主键ID
+	 * @param id            主键ID
 	 * @param indicatorName 指标名称
 	 * @param indicatorCede 指标编码
-	 * @param binSection 业务版块
-	 * @param binStage 业务阶段
-	 * @param dept 部门
-	 * @param company 公司
+	 * @param binSection    业务版块
+	 * @param binStage      业务阶段
+	 * @param dept          部门
+	 * @param company       公司
 	 * @return
 	 */
 	//@ImsPreAuth("eval:dataDictionary:view")
 	@GetMapping(value = "list")
-	public R list(@RequestParam(value = "id", required = false) String id,
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "id", required = false) String id,
 				  @RequestParam(value = "indicatorName", required = false) String indicatorName,
 				  @RequestParam(value = "indicatorCede", required = false) String indicatorCede,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage,
 				  @RequestParam(value = "dept", required = false) String dept,
 				  @RequestParam(value = "company", required = false) String company) {
-		List<Indicator> list = iIndicatorService.list(id, indicatorName, indicatorCede, binSection,binStage,dept,company);
+		IPage<Indicator> list = iIndicatorService.list(pageNum, pageSize, id, indicatorName, indicatorCede, binSection, binStage, dept, company);
 		return R.ok().data(list);
 	}
 
 	/**
 	 * 添加
+	 *
 	 * @param indicator
 	 * @return
 	 */

ims-service/ims-eval/src/main/java/com/ims/eval/entity/DataDictionary.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.sql.Date;
 import java.time.LocalDate;
 
 /**
@@ -54,7 +55,7 @@ public class DataDictionary extends Model {
     /**
      * 创建时间
      */
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 创建者
@@ -64,7 +65,7 @@ public class DataDictionary extends Model {
     /**
      * 更新时间
      */
-    private LocalDate updateTime;
+    private Date updateTime;
 
     /**
      * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/entity/DeptResponsibility.java

@@ -1,6 +1,8 @@
 package com.ims.eval.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.sql.Date;
 import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -42,12 +44,12 @@ public class DeptResponsibility extends Model {
     /**
      * 考核开始时间
      */
-    private LocalDate beginDate;
+    private Date beginDate;
 
     /**
      * 考核截止时间
      */
-    private LocalDate endDate;
+    private Date endDate;
 
     /**
      * 审批状态
@@ -62,7 +64,7 @@ public class DeptResponsibility extends Model {
     /**
      * 创建时间
      */
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 创建者
@@ -72,7 +74,7 @@ public class DeptResponsibility extends Model {
     /**
      * 更新时间
      */
-    private LocalDate updateTime;
+    private Date updateTime;
 
     /**
      * 更新者
@@ -87,7 +89,7 @@ public class DeptResponsibility extends Model {
     /**
      * 复审时间
      */
-    private LocalDate reviewPeopleTime;
+    private Date reviewPeopleTime;
 
     /**
      * 复审意见
@@ -102,7 +104,7 @@ public class DeptResponsibility extends Model {
     /**
      * 终审时间
      */
-    private LocalDate finalReviewPeopleTime;
+    private Date finalReviewPeopleTime;
 
     /**
      * 终审意见

ims-service/ims-eval/src/main/java/com/ims/eval/entity/DeptResponsibilityTarget.java

@@ -1,6 +1,6 @@
 package com.ims.eval.entity;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,12 +37,12 @@ public class DeptResponsibilityTarget extends Model {
     /**
      * 量化目标
      */
-    private BigDecimal quantizationTarget;
+    private double quantizationTarget;
 
     /**
      * 量化目标完成值
      */
-    private BigDecimal quantizationTargetActual;
+    private double quantizationTargetActual;
 
     /**
      * 评价目标
@@ -52,32 +52,32 @@ public class DeptResponsibilityTarget extends Model {
     /**
      * 评价目标完成值
      */
-    private BigDecimal evaluationTargetActual;
+    private double evaluationTargetActual;
 
     /**
      * 月度预警零界值
      */
-    private BigDecimal monthThreshold;
+    private double monthThreshold;
 
     /**
      * 季度预警零界值
      */
-    private BigDecimal seasonThreshold;
+    private double seasonThreshold;
 
     /**
      * 年度预警零界值
      */
-    private BigDecimal yearThreshold;
+    private double yearThreshold;
 
     /**
      * 方向
      */
-    private BigDecimal direction;
+    private double direction;
 
     /**
      * 排序
      */
-    private BigDecimal orderNum;
+    private Integer orderNum;
 
     /**
      * 备注
@@ -87,122 +87,122 @@ public class DeptResponsibilityTarget extends Model {
     /**
      * 一月目标
      */
-    private BigDecimal target1;
+    private double target1;
 
     /**
      * 一月完成值
      */
-    private BigDecimal actual1;
+    private double actual1;
 
     /**
      * 二月目标
      */
-    private BigDecimal target2;
+    private double target2;
 
     /**
      * 二月完值
      */
-    private BigDecimal actual2;
+    private double actual2;
 
     /**
      * 三月目标
      */
-    private BigDecimal target3;
+    private double target3;
 
     /**
      * 三月完成值
      */
-    private BigDecimal actual3;
+    private double actual3;
 
     /**
      * 四月目标
      */
-    private BigDecimal target4;
+    private double target4;
 
     /**
      * 四月完成值
      */
-    private BigDecimal actual4;
+    private double actual4;
 
     /**
      * 五月目标
      */
-    private BigDecimal target5;
+    private double target5;
 
     /**
      * 五月完成值
      */
-    private BigDecimal actual5;
+    private double actual5;
 
     /**
      * 六月目标
      */
-    private BigDecimal target6;
+    private double target6;
 
     /**
      * 六月完成值
      */
-    private BigDecimal actual6;
+    private double actual6;
 
     /**
      * 七月目标
      */
-    private BigDecimal target7;
+    private double target7;
 
     /**
      * 七月完成值
      */
-    private BigDecimal actual7;
+    private double actual7;
 
     /**
      * 八月目标
      */
-    private BigDecimal target8;
+    private double target8;
 
     /**
      * 八月完成值
      */
-    private BigDecimal actual8;
+    private double actual8;
 
     /**
      * 九月目标
      */
-    private BigDecimal target9;
+    private double target9;
 
     /**
      * 九月完成值
      */
-    private BigDecimal actual9;
+    private double actual9;
 
     /**
      * 十月目标
      */
-    private BigDecimal target10;
+    private double target10;
 
     /**
      * 十月完成值
      */
-    private BigDecimal actual10;
+    private double actual10;
 
     /**
      * 十一月目标
      */
-    private BigDecimal target11;
+    private double target11;
 
     /**
      * 十一月完成值
      */
-    private BigDecimal actual11;
+    private double actual11;
 
     /**
      * 十二月目标
      */
-    private BigDecimal target12;
+    private double target12;
 
     /**
      * 十二月完成值
      */
-    private BigDecimal actual12;
+    private double actual12;
 
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluateRule.java

@@ -1,8 +1,8 @@
 package com.ims.eval.entity;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+
+import java.sql.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -38,7 +38,7 @@ public class EvaluateRule extends Model {
     /**
      * 指标总分
      */
-    private BigDecimal totalScore;
+    private double totalScore;
 
     /**
      * 评分方式
@@ -58,7 +58,7 @@ public class EvaluateRule extends Model {
     /**
      * 创建时间
      */
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 创建者
@@ -68,7 +68,7 @@ public class EvaluateRule extends Model {
     /**
      * 更新时间
      */
-    private LocalDate updateTime;
+    private Date updateTime;
 
     /**
      * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluateScore.java

@@ -1,8 +1,8 @@
 package com.ims.eval.entity;
 
-import java.math.BigDecimal;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,7 +33,7 @@ public class EvaluateScore extends Model {
     /**
      * 创建时间
      */
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 创建者
@@ -43,7 +43,7 @@ public class EvaluateScore extends Model {
     /**
      * 更新时间
      */
-    private LocalDate updateTime;
+    private Date updateTime;
 
     /**
      * 更新者
@@ -73,12 +73,12 @@ public class EvaluateScore extends Model {
     /**
      * 系统评分
      */
-    private BigDecimal sysScore;
+    private double sysScore;
 
     /**
      * 复审评分
      */
-    private BigDecimal reviewScore;
+    private double reviewScore;
 
     /**
      * 复审人
@@ -88,7 +88,7 @@ public class EvaluateScore extends Model {
     /**
      * 复审时间
      */
-    private LocalDate reviewPeopleTime;
+    private Date reviewPeopleTime;
 
     /**
      * 复审意见

ims-service/ims-eval/src/main/java/com/ims/eval/entity/Indicator.java

@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -84,12 +85,12 @@ public class Indicator extends Model {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 修改时间
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * 创建者
@@ -109,7 +110,7 @@ public class Indicator extends Model {
     /**
      * 排序
      */
-    private BigDecimal orderNum;
+    private Integer orderNum;
 
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/IndicatorDictionary.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.sql.Date;
 import java.time.LocalDate;
 
 /**
@@ -44,7 +45,7 @@ public class IndicatorDictionary extends Model {
     /**
      * 选项顺序
      */
-    private BigDecimal optionOrder;
+    private Integer optionOrder;
 
     /**
      * 描述
@@ -59,7 +60,7 @@ public class IndicatorDictionary extends Model {
     /**
      * 创建时间
      */
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 更新者
@@ -69,7 +70,7 @@ public class IndicatorDictionary extends Model {
     /**
      * 更新时间
      */
-    private LocalDate updateTime;
+    private Date updateTime;
 
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/Report.java

@@ -1,10 +1,11 @@
 package com.ims.eval.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 发布公告表
@@ -37,7 +38,7 @@ public class Report extends Model {
     /**
      * 公告发布时间
      */
-    private LocalDate publishTime;
+    private Date publishTime;
 
     /**
      * 报告保存路径
@@ -52,7 +53,7 @@ public class Report extends Model {
     /**
      * 创建时间
      */
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 创建者
@@ -62,7 +63,7 @@ public class Report extends Model {
     /**
      * 更新时间
      */
-    private LocalDate updateTime;
+    private Date updateTime;
 
     /**
      * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/launch/LauncherServiceImpl.java

@@ -11,6 +11,9 @@ import java.util.Properties;
 public class LauncherServiceImpl implements LauncherService {
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
 
+		//http://123.60.219.66:8848/nacos/
+		//sh startup.sh -m standalone
+		//bash startup.sh -m standalone
 		//NACOS_ADDR=10.65.78.23:8848
 		Properties props = System.getProperties();
 		props.setProperty("spring.cloud.nacos.config.shared-dataids", "gddl_dbkp.yaml");

ims-service/ims-eval/src/main/java/com/ims/eval/service/IIndicatorService.java

@@ -1,5 +1,6 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.Indicator;
 
@@ -15,6 +16,6 @@ import java.util.List;
  */
 public interface IIndicatorService extends IService<Indicator> {
 
-	List<Indicator> list(String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company);
+	IPage<Indicator> list(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DataDictionaryServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ims.eval.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.DataDictionaryMapper;
 import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.IDataDictionaryService;
 import org.springframework.stereotype.Service;
 
@@ -40,7 +43,6 @@ public class DataDictionaryServiceImpl extends ServiceImpl<DataDictionaryMapper,
 		qw.lambda().orderByAsc(DataDictionary::getOrderNum);
 
 		List<DataDictionary> list = baseMapper.selectList(qw);
-
 		return list;
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ims.eval.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.dao.IndicatorMapper;
@@ -23,9 +25,11 @@ import java.util.List;
 public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator> implements IIndicatorService {
 
 	@Override
-	public List<Indicator> list(String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company) {
+	public IPage<Indicator> list(Integer pageNum, Integer pageSize,String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company) {
 
 		QueryWrapper<Indicator> qw = new QueryWrapper<>();
+		//构造分页构造器
+		Page<Indicator> page = new Page<>(pageNum, pageSize);
 		if (StringUtils.isNotEmpty(id)) {
 			qw.lambda().eq(Indicator::getId, id);
 		}
@@ -56,7 +60,7 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 
 		qw.lambda().orderByAsc(Indicator::getOrderNum);
 
-		List<Indicator> list = baseMapper.selectList(qw);
+		IPage<Indicator>  list = baseMapper.selectPage(page,qw);
 
 		return list;
 	}