站点管理站点分组新增、修改

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteGroupingController.java

@@ -1,9 +1,14 @@
 package com.bizmatics.controller.web;
 
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.service.SiteGroupingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,9 +18,27 @@ import org.springframework.stereotype.Controller;
  * @author ya
  * @since 2021-09-17
  */
-@Controller
+@RestController
 @RequestMapping("/siteGrouping")
 public class SiteGroupingController {
+    @Autowired
+    private SiteGroupingService siteGroupingService;
 
+    /**
+     *
+     * @param groupingName 站点分组名称
+     * @return
+     */
+    @RequestMapping("SiteGroupingAdd")
+    public ApiResult<Void> SiteGroupingAdd(@RequestParam String groupingName){
+        siteGroupingService.SiteGroupingAdd(groupingName);
+        return ApiResult.success();
+    }
+
+    @RequestMapping("SiteGroupingUpdate")
+    public ApiResult<Void> SiteGroupingUpdate(@RequestParam String groupingName,@RequestParam int id){
+        siteGroupingService.SiteGroupingUpdate(groupingName,id);
+        return ApiResult.success();
+    }
 }
 

fiveep-model/src/main/java/com/bizmatics/model/SiteGrouping.java

@@ -1,6 +1,7 @@
 package com.bizmatics.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -32,16 +33,19 @@ public class SiteGrouping implements Serializable {
     /**
      * 分组名称
      */
+    @TableField("grouping_name")
     private String groupingName;
 
     /**
      * 创建人
      */
+    @TableField("creator")
     private String creator;
 
     /**
      * 创建时间
      */
+    @TableField("creation_time")
     private LocalDateTime creationTime;
 
 

fiveep-service/src/main/java/com/bizmatics/service/RtAnalogDataService.java

@@ -40,8 +40,34 @@ public interface RtAnalogDataService extends CrudService<RtAnalogData> {
     Double getEpLoad(Integer siteId);
 
 
+    /**
+     *
+     * @param siteId
+     * @param startTime
+     * @param endTime
+     * @param queryType
+     * @return
+     */
     List<Map<String,Object>> getDataReport(Integer siteId,Date startTime, Date endTime,String queryType);
+
+    /**
+     *
+     * @param siteId
+     * @param startTime
+     * @param endTime
+     * @param queryType
+     * @return
+     */
     List<Map<String,Object>> getHistoricalCurve(Integer siteId,Date startTime, Date endTime,String queryType);
+
+    /**
+     *
+     * @param siteId
+     * @param startTime
+     * @param endTime
+     * @param queryType
+     * @return
+     */
     String DataReportExport(Integer siteId,Date startTime, Date endTime,String queryType);
 
 }

fiveep-service/src/main/java/com/bizmatics/service/SiteGroupingService.java

@@ -1,7 +1,11 @@
 package com.bizmatics.service;
 
+import com.bizmatics.model.Site;
 import com.bizmatics.model.SiteGrouping;
 import com.bizmatics.common.mvc.base.CrudService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,8 @@ import com.bizmatics.common.mvc.base.CrudService;
  * @since 2021-09-17
  */
 public interface SiteGroupingService extends CrudService<SiteGrouping> {
+    void SiteGroupingAdd(@Param("groupingName") String groupingName);
+    void SiteGroupingUpdate(@Param("groupingName") String groupingName,
+                            @Param("id") int id);
 
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteGroupingServiceImpl.java

@@ -4,8 +4,13 @@ import com.bizmatics.model.SiteGrouping;
 import com.bizmatics.persistence.mapper.SiteGroupingMapper;
 import com.bizmatics.service.SiteGroupingService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SessionLocal;
+import org.apache.poi.hpsf.Date;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class SiteGroupingServiceImpl extends AbstractCrudService<SiteGroupingMapper, SiteGrouping> implements SiteGroupingService {
 
+    public void SiteGroupingAdd(String groupingName){
+        SiteGrouping siteGrouping = new SiteGrouping();
+        siteGrouping.setGroupingName(groupingName);
+        siteGrouping.setCreator(SessionLocal.getUser().getUserName());
+        siteGrouping.setCreationTime(LocalDateTime.now());
+        this.save(siteGrouping);
+    }
+
+    public void SiteGroupingUpdate(String groupingName,int id){
+        SiteGrouping siteGrouping = new SiteGrouping();
+        siteGrouping.setGroupingName(groupingName);
+        siteGrouping.setId(id);
+        this.updateById(siteGrouping);
+    }
 }