新增表

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/IndicatorsController.java

@@ -9,6 +9,7 @@ import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.xml.crypto.Data;
 import java.util.List;
 
 /**
@@ -41,9 +42,10 @@ public class IndicatorsController {
                       @RequestParam(value = "stationid",required = false) String stationid,
                       @RequestParam(value = "stationname",required = false) String stationname,
                       @RequestParam(value = "kay",required = false) String kay,
+                      @RequestParam(value = "createtime",required = false) Data createtime,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Indicators> list = iIndicatorsService.getList( id,  stationid,  stationname,  kay,  pageNum,  pageSize) ;
+        IPage<Indicators> list = iIndicatorsService.getList( id,  stationid,  stationname,  kay, createtime, pageNum,  pageSize) ;
         if (null != list){
             return R.ok().data(list);
         }else {

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Indicators.java

@@ -1,6 +1,9 @@
 package com.gyee.backconfig.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,16 +23,18 @@ public class Indicators extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value="id",type = IdType.ASSIGN_ID)
     private String id;
 
     private String stationid;
 
     private String stationname;
 
-    private String kay;
+    private String kay;//指标
 
     private String value;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createtime;
 
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IIndicatorsService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Indicators;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.xml.crypto.Data;
+
 /**
  * <p>
  *  服务类
@@ -14,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIndicatorsService extends IService<Indicators> {
 
-    IPage<Indicators> getList(String id, String stationid, String stationname, String kay, String pageNum, String pageSize);
+    IPage<Indicators> getList(String id, String stationid, String stationname, String kay, Data createtime, String pageNum, String pageSize);
 
     Indicators getOne(String id);
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/IndicatorsServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.xml.crypto.Data;
 import java.util.Arrays;
 
 /**
@@ -25,7 +26,7 @@ import java.util.Arrays;
 public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicators> implements IIndicatorsService {
 
     @Override
-    public IPage<Indicators> getList(String id, String stationid, String stationname, String kay, String pageNum, String pageSize) {
+    public IPage<Indicators> getList(String id, String stationid, String stationname, String kay, Data  createtime, String pageNum, String pageSize) {
         QueryWrapper<Indicators> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -59,7 +60,14 @@ public class IndicatorsServiceImpl extends ServiceImpl<IndicatorsMapper, Indicat
 
     @Override
     public boolean addOrUpdate(Indicators indicators) {
-        boolean b =  this.saveOrUpdate(indicators);
+//        boolean b =  this.saveOrUpdate(indicators);
+        boolean b = false;
+        if(null==indicators.getId()){
+             b = this.save(indicators);
+        }else{
+            b= this.updateById(indicators);
+        }
+
         return b;
     }