Merge branch 'master' into feature-secrity-2021-9-17

# Conflicts:
#	fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

fiveep-controller/src/main/java/com/bizmatics/controller/MyConfiguration.java

@@ -0,0 +1,25 @@
+package com.bizmatics.controller;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+
+@Configuration
+public class MyConfiguration extends WebMvcConfigurationSupport {
+
+    @Override
+    protected void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        // 解决controller返回字符串中文乱码问题
+        for (HttpMessageConverter<?> converter : converters) {
+            if (converter instanceof StringHttpMessageConverter) {
+                ((StringHttpMessageConverter)converter).setDefaultCharset(StandardCharsets.UTF_8);
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package com.bizmatics.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备属性 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-23
+ */
+@Controller
+@RequestMapping("/deviceAttribute")
+public class DeviceAttributeController {
+
+}
+

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

@@ -4,7 +4,9 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceList;
 import com.bizmatics.model.HtAnalogData;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
 import com.bizmatics.service.DeviceService;
@@ -76,5 +78,10 @@ public class DeviceController {
         }
         return list1;
     }
+
+    @GetMapping("DeviceList")
+    public ApiResult<List<DeviceList>> DeviceList(@RequestParam String siteId) {
+        return ApiResult.success(deviceService.DeviceList(siteId));
+    }
 }
 

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

@@ -70,7 +70,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude(new String[]{"site_grouping"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude(new String[]{"device_attribute"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -3,6 +3,8 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.Site;
+import com.bizmatics.model.SiteList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 站点
@@ -31,38 +34,164 @@ public class SiteController {
 
     /**
      * 查看不同状态的站点数量
+     *
      * @return
      */
     @GetMapping("count")
-    public ApiResult<DeviceCountVO> getCount(){
+    public ApiResult<DeviceCountVO> getCount() {
         return ApiResult.success(siteService.selectCount());
     }
 
 
     /**
      * 查看站点列表
+     *
      * @param name 名称
      * @return
      */
     @GetMapping("list")
-    public ApiResult<List<Site>> list(@RequestParam(required = false) String name){
+    public ApiResult<List<Site>> list(@RequestParam(required = false) String name) {
         return ApiResult.success(siteService.list(name));
     }
 
+    /**
+     * @param name 站点名称
+     * @return
+     */
 
     @GetMapping("listStatus")
-    public ApiResult<List<SiteVO>> siteAndStatus(@RequestParam(required = false) String name){
+    public ApiResult<List<SiteVO>> siteAndStatus(@RequestParam(required = false) String name) {
         return ApiResult.success(siteService.siteAndStatusList(name));
     }
 
     /**
      * 查看站点详情
+     *
      * @param siteId 站点id
      * @return
      */
     @GetMapping("one")
-    public ApiResult<SiteVO> getOne(@RequestParam Long siteId){
+    public ApiResult<SiteVO> getOne(@RequestParam Long siteId) {
         return ApiResult.success(siteService.getOne(siteId));
     }
+
+    /**
+     * 查看站点列表
+     *
+     * @param name 站点名称
+     * @return
+     */
+    @GetMapping("Sitelist")
+    public ApiResult<List<Map<String, Object>>> Sitelist(@RequestParam(required = false) String name) {
+        return ApiResult.success(siteService.Sitelist(name));
+    }
+
+
+    /**
+     *
+     * @param id 站点ID
+     * @param siteName 站点名称
+     * @param siteAddress 站点地址
+     * @param userName
+     * @param phone
+     * @param stationAreaId
+     * @param routeId
+     * @param installedCapacity
+     * @param rheologicalChange
+     * @param longitude
+     * @param latitude
+     * @param region
+     * @param groupingId
+     * @param faultStatus
+     * @param realTimeLoad
+     * @param totalElectricity
+     * @param powerFactor
+     * @param siteType
+     * @param userCompany
+     * @param operationTime
+     * @param serviceDeadline
+     * @param powerSupplyType
+     * @param voltageLevel
+     * @param demolitionStandardCoal
+     * @param demolitionStandardCoal1
+     * @param sitePictureOne
+     * @param sitePictureTwo
+     * @param sitePictureThree
+     * @param templateId
+     * @return
+     */
+    @GetMapping("SiteAdd")
+    public ApiResult<Void> SiteAdd(@RequestParam(required = false) String id,
+                                   @RequestParam(required = false) String siteName,
+                                   @RequestParam(required = false) String siteAddress,
+                                   @RequestParam(required = false) String userName,
+                                   @RequestParam(required = false) String phone,
+                                   @RequestParam(required = false) String stationAreaId,
+                                   @RequestParam(required = false) String routeId,
+                                   @RequestParam(required = false) String installedCapacity,
+                                   @RequestParam(required = false) String rheologicalChange,
+                                   @RequestParam(required = false) String longitude,
+                                   @RequestParam(required = false) String latitude,
+                                   @RequestParam(required = false) String region,
+                                   @RequestParam(required = false) String groupingId,
+                                   @RequestParam(required = false) String faultStatus,
+                                   @RequestParam(required = false) String realTimeLoad,
+                                   @RequestParam(required = false) String totalElectricity,
+                                   @RequestParam(required = false) String powerFactor,
+                                   @RequestParam(required = false) String siteType,
+                                   @RequestParam(required = false) String userCompany,
+                                   @RequestParam(required = false) String operationTime,
+                                   @RequestParam(required = false) String serviceDeadline,
+                                   @RequestParam(required = false) String powerSupplyType,
+                                   @RequestParam(required = false) String voltageLevel,
+                                   @RequestParam(required = false) String demolitionStandardCoal,
+                                   @RequestParam(required = false) String demolitionStandardCoal1,
+                                   @RequestParam(required = false) String sitePictureOne,
+                                   @RequestParam(required = false) String sitePictureTwo,
+                                   @RequestParam(required = false) String sitePictureThree,
+                                   @RequestParam(required = false) String templateId) {
+        if (id.equals("")&&id.equals("0")&&id.equals("null")){
+            siteService.SiteAdd(siteName, siteAddress, userName, phone,
+                    stationAreaId, routeId, installedCapacity, rheologicalChange, longitude,
+                    latitude, region, groupingId, faultStatus, realTimeLoad,
+                    totalElectricity, powerFactor, siteType, userCompany,
+                    operationTime, serviceDeadline, powerSupplyType, voltageLevel,
+                    demolitionStandardCoal, demolitionStandardCoal1,sitePictureOne,sitePictureTwo,sitePictureThree,templateId);
+        }else {
+            siteService.SiteUpdate(id, siteName, siteAddress, userName, phone,
+                     stationAreaId, routeId, installedCapacity, rheologicalChange, longitude,
+                     latitude, region, groupingId, faultStatus,  realTimeLoad,
+                     totalElectricity,  powerFactor,   siteType,  userCompany,
+                     operationTime,  serviceDeadline,  powerSupplyType,  voltageLevel,
+                     demolitionStandardCoal,  demolitionStandardCoal1, sitePictureOne,
+                     sitePictureTwo, sitePictureThree);
+        }
+
+        return ApiResult.success();
+    }
+
+    @GetMapping("SiteDel")
+    public ApiResult<Void> SiteDel(@RequestParam(required = false) String id) {
+            siteService.Sitedel(id);
+        return ApiResult.success();
+    }
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("GetSite")
+    public ApiResult<List<TemplateData>> GetSite(@RequestParam String id) {
+        List<TemplateData> TemplateDataList = siteService.GetSite(id);
+        System.out.println(TemplateDataList);
+        return ApiResult.success(siteService.GetSite(id));
+    }
+
+
+    @GetMapping("test1")
+    public String test(){
+        return "这是中文";
+    }
 }
 

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

@@ -0,0 +1,21 @@
+package com.bizmatics.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 站点动态属性表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+@Controller
+@RequestMapping("/siteDynamicProperties")
+public class SiteDynamicPropertiesController {
+
+}
+

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-controller/src/main/java/com/bizmatics/controller/web/SiteTypeController.java

@@ -0,0 +1,21 @@
+package com.bizmatics.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+@Controller
+@RequestMapping("/siteType")
+public class SiteTypeController {
+
+}
+

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

@@ -0,0 +1,81 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 设备属性
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceAttribute implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备动态属性id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备id
+     */
+    private Integer deviceId;
+
+    /**
+     * 回路表计地址
+     */
+    private Integer loopMeterAddress;
+
+    /**
+     * 额定电压（kv）
+     */
+    private Double ratedVoltage;
+
+    /**
+     * 额定电流（A）
+     */
+    private Double ratedCurrent;
+
+    /**
+     * 电流负载率门限
+     */
+    private Double currentLoadRate;
+
+    /**
+     * 监控设备编号
+     */
+    private String monitoringEquipmentNo;
+
+    /**
+     * 变量列表id
+     */
+    private Integer variableListId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 电能质量分析
+     */
+    private String qualityAnalysis;
+}

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

@@ -0,0 +1,117 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceList implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备信息表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 所属站点
+     */
+    private Integer siteId;
+
+    /**
+     * 设备安装位置
+     */
+    private String deviceAddress;
+
+    /**
+     * 1：183用电设备，2：视频监控设备，3：171用电设备，4：173用电设备，5：158智能网关，6：其他
+     */
+    private String deviceType;
+
+    /**
+     * 安装时间
+     */
+    private Date installTime;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 使能标识（0 不生效，1生效）
+     */
+    private Integer enable;
+
+    @TableField(exist = false)
+    private Integer deviceStatus;
+
+    /**
+     * 站点里面字段信息
+     */
+    @TableField(exist = false)
+    private String installedCapacity;
+    /**
+     * 回路表计地址
+     */
+    private Integer loopMeterAddress;
+
+    /**
+     * 额定电压（kv）
+     */
+    private Double ratedVoltage;
+
+    /**
+     * 额定电流（A）
+     */
+    private Double ratedCurrent;
+
+    /**
+     * 电流负载率门限
+     */
+    private Double currentLoadRate;
+
+    /**
+     * 监控设备编号
+     */
+    private String monitoringEquipmentNo;
+
+    /**
+     * 变量列表id
+     */
+    private Integer variableListId;
+
+    /**
+     * 电能质量分析
+     */
+    private String qualityAnalysis;
+}

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

@@ -0,0 +1,36 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class GroupingList implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 站点分组表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分组名称
+     */
+    private String groupingName;
+}

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

@@ -99,5 +99,14 @@ public class Site implements Serializable {
 
     private String installedCapacity;
 
+    /**
+     * 分组ID
+     */
+    private Integer groupingId;
+
+    /**
+     * 流变变化
+     */
+    private String rheologicalChange;
 
 }

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

@@ -0,0 +1,133 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 站点动态属性表
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SiteDynamicProperties implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 站点动态属性id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 故障状态
+     */
+    private String faultStatus;
+
+    /**
+     * 实时负荷
+     */
+    private String realTimeLoad;
+
+    /**
+     * 总电量
+     */
+    private String totalElectricity;
+
+    /**
+     * 功率因数
+     */
+    private String powerFactor;
+
+    /**
+     * 站点id
+     */
+    private Integer siteId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 站点类型
+     */
+    private Integer siteType;
+
+    /**
+     * 用户公司
+     */
+    private String userCompany;
+
+    /**
+     * 投运时间
+     */
+    private LocalDate operationTime;
+
+    /**
+     * 服务截止
+     */
+    private LocalDate serviceDeadline;
+
+    /**
+     * 供电类型:1\单路、2\双路
+     */
+    private Integer powerSupplyType;
+
+    /**
+     * 电压等级
+     */
+    private String voltageLevel;
+
+    /**
+     * 拆标准煤:1\电力（等价）、2\电力（当量）
+     */
+    @TableField("demolition_standard_coal")
+    private Integer demolitionStandardCoal;
+
+    /**
+     * 拆标准煤
+     */
+    @TableField("demolition_standard_coal1")
+    private String demolitionStandardCoal1;
+
+    /**
+     * 站点图片一
+     */
+    @TableField("site_picture_one")
+    private String sitePictureOne;
+
+
+    /**
+     * 站点图片二
+     */
+    @TableField("site_picture_two")
+    private String sitePictureTwo;
+
+
+    /**
+     * 站点图片三
+     */
+    @TableField("site_picture_three")
+    private String sitePictureThree;
+
+
+
+}

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-model/src/main/java/com/bizmatics/model/SiteList.java

@@ -0,0 +1,52 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SiteList implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 站点表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
+    /**
+     * 分组ID
+     */
+    private Integer groupingId;
+
+    /**
+     * 分组名称
+     */
+    private String groupingName;
+}

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

@@ -0,0 +1,37 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SiteType implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 站点类型表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+
+}

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

@@ -0,0 +1,190 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TemplateData implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 站点表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 故障状态
+     */
+    private String faultStatus;
+
+    /**
+     * 实时负荷
+     */
+    private String realTimeLoad;
+
+    /**
+     * 总电量
+     */
+    private String totalElectricity;
+
+    /**
+     * 功率因数
+     */
+    private String powerFactor;
+
+    /**
+     * 站点id
+     */
+    private Integer siteId;
+
+    /**
+     * 站点类型
+     */
+    private Integer siteType;
+
+    /**
+     * 用户公司
+     */
+    private String userCompany;
+
+    /**
+     * 投运时间
+     */
+    private LocalDate operationTime;
+
+    /**
+     * 服务截止
+     */
+    private LocalDate serviceDeadline;
+
+    /**
+     * 供电类型:1\单路、2\双路
+     */
+    private Integer powerSupplyType;
+
+    /**
+     * 电压等级
+     */
+    private String voltageLevel;
+
+    /**
+     * 拆标准煤:1\电力（等价）、2\电力（当量）
+     */
+    @TableField("demolition_standard_coal")
+    private Integer demolitionStandardCoal;
+
+    /**
+     * 拆标准煤
+     */
+    @TableField("demolition_standard_coal1")
+    private String demolitionStandardCoal1;
+
+    /**
+     * 站点图片一
+     */
+    @TableField("site_picture_one")
+    private String sitePictureOne;
+
+
+    /**
+     * 站点图片二
+     */
+    @TableField("site_picture_two")
+    private String sitePictureTwo;
+
+
+    /**
+     * 站点图片三
+     */
+    @TableField("site_picture_three")
+    private String sitePictureThree;
+
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
+    /**
+     * 站点位置
+     */
+    private String siteAddress;
+
+    /**
+     * 所属单位
+     */
+    private Integer companyCode;
+
+    /**
+     * 联系人
+     */
+    private String userName;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 所属台区
+     */
+    private Integer stationAreaId;
+
+    /**
+     * 所属线路
+     */
+    private Integer routeId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属区域（1 宝山，2 嘉定）
+     */
+    private Integer region;
+
+    /**
+     * 使能标识（0 不生效，1 生效）
+     */
+    private Integer enable;
+
+
+    private String installedCapacity;
+
+    /**
+     * 分组ID
+     */
+    private Integer groupingId;
+
+    /**
+     * 流变变化
+     */
+    private String rheologicalChange;
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceAttributeMapper.java

@@ -0,0 +1,16 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 设备属性 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-23
+ */
+public interface DeviceAttributeMapper extends CrudMapper<DeviceAttribute> {
+
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceMapper.java

@@ -2,6 +2,7 @@ package com.bizmatics.persistence.mapper;
 
 import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.DeviceList;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -41,6 +42,7 @@ public interface DeviceMapper extends CrudMapper<Device> {
                       @Param("startTime") Date startTime,
                       @Param("endTime") Date endTime,
                       @Param("type") String type);
+    List<DeviceList> DeviceList(@Param("siteId") Integer siteId);
 
 
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteDynamicPropertiesMapper.java

@@ -0,0 +1,20 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.Site;
+import com.bizmatics.model.SiteDynamicProperties;
+import com.bizmatics.common.mvc.base.CrudMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 站点动态属性表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+public interface SiteDynamicPropertiesMapper extends CrudMapper<SiteDynamicProperties> {
+    List<SiteDynamicProperties> list(@Param("siteId") Integer siteId);
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteMapper.java

@@ -1,7 +1,6 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.Device;
-import com.bizmatics.model.Site;
+import com.bizmatics.model.*;
 import com.bizmatics.common.mvc.base.CrudMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -32,6 +31,18 @@ public interface SiteMapper extends CrudMapper<Site> {
     List<Device> idList(@Param("userId") Integer userId,
                         @Param("name") String name);
 
+    List<SiteList> Sitelist(@Param("userId") Integer userId,
+                            @Param("name") String name);
 
+    List<GroupingList> GroupingList(@Param("name") String name,
+                                    @Param("creator") String creator);
 
+    List<SiteList> SiteGroupinglist(@Param("userId") Integer userId,
+                                    @Param("name") String name);
+
+    List<TemplateData> templateQuery(@Param("id") Integer id);
+
+    List<Site> list1(@Param("id") Integer id);
+
+    List<SiteDynamicProperties> SiteDynamicPropertieslist(@Param("siteId") Integer siteId);
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteTypeMapper.java

@@ -0,0 +1,16 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.SiteType;
+import com.bizmatics.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+public interface SiteTypeMapper extends CrudMapper<SiteType> {
+
+}

fiveep-persistence/src/main/resources/mapper/mysql/DeviceAttributeMapper.xml

@@ -0,0 +1,19 @@
+<?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.bizmatics.persistence.mapper.DeviceAttributeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.DeviceAttribute">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="loop_meter_address" property="loopMeterAddress" />
+        <result column="rated_voltage" property="ratedVoltage" />
+        <result column="rated_current" property="ratedCurrent" />
+        <result column="current_load_rate" property="currentLoadRate" />
+        <result column="monitoring_equipment_no" property="monitoringEquipmentNo" />
+        <result column="variable_list_id" property="variableListId" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+</mapper>

fiveep-persistence/src/main/resources/mapper/mysql/DeviceMapper.xml

@@ -74,4 +74,26 @@
         </where>
     </select>
 
+    <select id="DeviceList" resultType="com.bizmatics.model.DeviceList">
+        SELECT
+        a.*, b.device_status,
+        c.loop_meter_address,
+        c.rated_voltage,
+        c.rated_current,
+        c.current_load_rate,
+        monitoring_equipment_no,
+        c.variable_list_id,
+        c.quality_analysis
+        FROM
+        device AS a
+        JOIN device_status AS b ON a.device_code = b.device_code
+        LEFT JOIN device_attribute AS c ON a.id = c.device_id
+        <where>
+            a.enable =1
+            <if test="siteId != null and siteId != 0">
+                and a.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/SiteDynamicPropertiesMapper.xml

@@ -0,0 +1,34 @@
+<?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.bizmatics.persistence.mapper.SiteDynamicPropertiesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.SiteDynamicProperties">
+        <id column="id" property="id" />
+        <result column="fault_status" property="faultStatus" />
+        <result column="real_time_load" property="realTimeLoad" />
+        <result column="total_electricity" property="totalElectricity" />
+        <result column="power_factor" property="powerFactor" />
+        <result column="site_id" property="siteId" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="site_type" property="siteType" />
+        <result column="user_company" property="userCompany" />
+        <result column="operation_time" property="operationTime" />
+        <result column="service_deadline" property="serviceDeadline" />
+        <result column="power_supply_type" property="powerSupplyType" />
+        <result column="voltage_level" property="voltageLevel" />
+        <result column="Demolition_standard_coal" property="demolitionStandardCoal" />
+        <result column="Demolition_standard_coal1" property="demolitionStandardCoal1" />
+    </resultMap>
+    <select id="list" resultType="com.bizmatics.model.SiteDynamicProperties">
+        select *
+        from  site_dynamic_properties
+        <where>
+            <if test="siteId != null and siteId != 0">
+                and site_id = #{siteId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -4,20 +4,21 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.bizmatics.model.Site">
-        <id column="id" property="id" />
-        <result column="site_name" property="siteName" />
-        <result column="site_address" property="siteAddress" />
-        <result column="company_code" property="companyCode" />
-        <result column="user_name" property="userName" />
-        <result column="phone" property="phone" />
-        <result column="station_area_id" property="stationAreaId" />
-        <result column="route_id" property="routeId" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="region" property="region" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
+        <id column="id" property="id"/>
+        <result column="site_name" property="siteName"/>
+        <result column="site_address" property="siteAddress"/>
+        <result column="company_code" property="companyCode"/>
+        <result column="user_name" property="userName"/>
+        <result column="phone" property="phone"/>
+        <result column="station_area_id" property="stationAreaId"/>
+        <result column="route_id" property="routeId"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="region" property="region"/>
+        <result column="create_time" property="createTime"/>
+        <result column="creator" property="creator"/>
+        <result column="enable" property="enable"/>
+        <result column="grouping_id" property="groupingId"/>
     </resultMap>
     <select id="selectCount" resultType="java.lang.Integer">
         select count(*)
@@ -54,8 +55,73 @@
             <if test="name != null and name != ''">
                 and s.site_name LIKE CONCAT(CONCAT('%', #{name}), '%')
             </if>
+
+        </where>
+    </select>
+    <select id="Sitelist" resultType="com.bizmatics.model.SiteList">
+        select
+        a.user_id,
+        b.id,
+        b.grouping_id,
+        b.site_name,
+        c.grouping_name
+        from user_site as a
+        join site as b on a.site_id = b.id
+        left join site_grouping as c on b.grouping_id = c.id
+        <where>
+                b.enable=1
+            <if test="userId != null and userId != 0">
+                and a.user_id = #{userId}
+            </if>
+            <if test="name != null and name != ''">
+                and b.site_name like CONCAT(CONCAT('%', #{name}), '%')
+            </if>
+            order by b.id desc
         </where>
     </select>
+
+    <select id="GroupingList" resultType="com.bizmatics.model.GroupingList">
+        select
+        a.id,
+        a.grouping_name
+        from site_grouping as a
+        left join site as b on a.id = b.grouping_id
+        <where>
+            b.enable=1
+            <if test="name != null and name != ''">
+                and b.site_name like CONCAT(CONCAT('%', #{name}), '%')
+            </if>
+            <if test="creator != null and creator != ''">
+                and a.creator = #{creator}
+            </if>
+            group by a.id
+            order by a.id desc
+        </where>
+    </select>
+
+    <select id="SiteGroupinglist" resultType="com.bizmatics.model.SiteList">
+        select
+        a.user_id,
+        b.id,
+        b.grouping_id,
+        b.site_name,
+        c.grouping_name
+        from user_site as a
+        join site as b on a.site_id = b.id
+        left join site_grouping as c on b.grouping_id = c.id
+        <where>
+            b.enable=1
+            and b.grouping_id=0
+            <if test="userId != null and userId != 0">
+                and a.user_id = #{userId}
+            </if>
+            <if test="name != null and name != ''">
+                and b.site_name like CONCAT(CONCAT('%', #{name}), '%')
+            </if>
+            order by b.id desc
+        </where>
+    </select>
+
     <select id="idList" resultType="java.lang.Integer">
         select s.id
         from user_site as us
@@ -70,6 +136,67 @@
             </if>
         </where>
     </select>
+    <select id="templateQuery" resultType="com.bizmatics.model.TemplateData">
+        select
+        a.id,
+        a.site_name,
+        a.site_address,
+        a.company_code,
+        a.user_name,
+        a.phone,
+        a.station_area_id,
+        a.route_id,
+        a.installed_capacity,
+        a.rheological_change,
+        a.longitude,
+        a.latitude,
+        a.region,
+        a.grouping_id,
+        b.fault_status,
+        b.real_time_load,
+        b.total_electricity,
+        b.power_factor,
+        b.site_id,
+        b.site_type,
+        b.user_company,
+        b.operation_time,
+        b.service_deadline,
+        b.power_supply_type,
+        b.voltage_level,
+        b.demolition_standard_coal,
+        b.demolition_standard_coal1,
+        b.site_picture_one,
+        b.site_picture_two,
+        b.site_picture_three
+        from
+        site AS a
+        left join site_dynamic_properties as b on a.id = b.site_id
+        <where>
+                a.enable=1
+            <if test="id != null and id != 0">
+                and a.id = #{id}
+            </if>
+        </where>
+    </select>
+    <select id="list1" resultType="com.bizmatics.model.Site">
+        select *
+        from  site
+        <where>
+             enable=1
+            <if test="id != null and id != 0">
+                and id = #{id}
+            </if>
+        </where>
+    </select>
+    <select id="SiteDynamicPropertieslist" resultType="com.bizmatics.model.SiteDynamicProperties">
+        select *
+        from  site_dynamic_properties
+        <where>
+            <if test="siteId != null and siteId != 0">
+                and site_id = #{siteId}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/SiteTypeMapper.xml

@@ -0,0 +1,11 @@
+<?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.bizmatics.persistence.mapper.SiteTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.SiteType">
+        <id column="id" property="id" />
+        <result column="type_name" property="typeName" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,16 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 设备属性 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-23
+ */
+public interface DeviceAttributeService extends CrudService<DeviceAttribute> {
+
+}

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

@@ -2,9 +2,12 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DeviceList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.vo.DeviceCountVO;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -29,4 +32,6 @@ public interface DeviceService extends CrudService<Device> {
      * @return
      */
     DeviceCountVO selectDeviceCountByType(Integer site);
+
+    List<DeviceList> DeviceList(String siteId);
 }

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/SiteDynamicPropertiesService.java

@@ -0,0 +1,53 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.SiteDynamicProperties;
+import com.bizmatics.common.mvc.base.CrudService;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 站点动态属性表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+public interface SiteDynamicPropertiesService extends CrudService<SiteDynamicProperties> {
+
+    /**
+     *
+     * @param fault_status
+     * @param real_time_load
+     * @param total_electricity
+     * @param power_factor
+     * @param site_id
+     * @param site_type
+     * @param user_company
+     * @param operation_time
+     * @param service_deadline
+     * @param power_supply_type
+     * @param voltage_level
+     * @param Demolition_standard_coal
+     * @param Demolition_standard_coal1
+     */
+    void SiteDynamicPropertiesAdd(@Param("fault_status") String fault_status,
+                                  @Param("real_time_load") String real_time_load,
+                                  @Param("total_electricity") String total_electricity,
+                                  @Param("power_factor") String power_factor,
+                                  @Param("site_id") int site_id,
+                                  @Param("site_type") String site_type,
+                                  @Param("user_company") String user_company,
+                                  @Param("operation_time") String operation_time,
+                                  @Param("service_deadline") String service_deadline,
+                                  @Param("power_supply_type") String power_supply_type,
+                                  @Param("voltage_level") String voltage_level,
+                                  @Param("Demolition_standard_coal") String Demolition_standard_coal,
+                                  @Param("Demolition_standard_coal1") String Demolition_standard_coal1,
+                                  @Param("sitePictureOne") String sitePictureOne,
+                                  @Param("sitePictureTwo") String sitePictureTwo,
+                                  @Param("sitePictureThree") String sitePictureThree);
+
+    void SiteDynamicPropertiesUpdate(@Param("fault_status") SiteDynamicProperties siteDynamicProperties);
+}
+
+

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,18 @@ import com.bizmatics.common.mvc.base.CrudService;
  * @since 2021-09-17
  */
 public interface SiteGroupingService extends CrudService<SiteGrouping> {
+    /**
+     *
+     * @param groupingName
+     */
+    void SiteGroupingAdd(@Param("groupingName") String groupingName);
+
+    /**
+     *
+     * @param groupingName
+     * @param id
+     */
+    void SiteGroupingUpdate(@Param("groupingName") String groupingName,
+                            @Param("id") int id);
 
 }

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

@@ -2,10 +2,15 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.Site;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.SiteDynamicProperties;
+import com.bizmatics.model.SiteList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -32,6 +37,13 @@ public interface SiteService extends CrudService<Site> {
      */
     List<Site> list(String name);
 
+    /**
+     * 查看站点列表
+     * @param name
+     * @return
+     */
+    List<Map<String, Object>> Sitelist(String name);
+
 
     /**
      * 查看站点和状态
@@ -50,5 +62,97 @@ public interface SiteService extends CrudService<Site> {
      */
     SiteVO getOne(Long siteId);
 
+    /**
+     *
+     * @param siteName
+     * @param siteAddress
+     * @param userName
+     * @param phone
+     * @param stationAreaId
+     * @param routeId
+     * @param installedCapacity
+     * @param rheologicalChange
+     * @param longitude
+     * @param latitude
+     * @param region
+     * @param groupingId
+     * @param faultStatus
+     * @param realTimeLoad
+     * @param totalElectricity
+     * @param powerFactor
+     * @param siteType
+     * @param userCompany
+     * @param operationTime
+     * @param serviceDeadline
+     * @param powerSupplyType
+     * @param voltageLevel
+     * @param DemolitionStandardCoal
+     * @param DemolitionStandardCoal1
+     */
+    void SiteAdd(@Param("siteName") String siteName,
+                 @Param("siteAddress") String siteAddress,
+                 @Param("userName") String userName,
+                 @Param("phone") String phone,
+                 @Param("stationAreaId") String stationAreaId,
+                 @Param("routeId") String routeId,
+                 @Param("installedCapacity") String installedCapacity,
+                 @Param("rheologicalChange") String rheologicalChange,
+                 @Param("longitude") String longitude,
+                 @Param("latitude") String latitude,
+                 @Param("region") String region,
+                 @Param("groupingId") String groupingId,
+                 @Param("faultStatus") String faultStatus,
+                 @Param("realTimeLoad") String realTimeLoad,
+                 @Param("totalElectricity") String totalElectricity,
+                 @Param("powerFactor") String powerFactor,
+                 @Param("siteType") String siteType,
+                 @Param("userCompany") String userCompany,
+                 @Param("operationTime") String operationTime,
+                 @Param("serviceDeadline") String serviceDeadline,
+                 @Param("powerSupplyType") String powerSupplyType,
+                 @Param("voltageLevel") String voltageLevel,
+                 @Param("DemolitionStandardCoal") String DemolitionStandardCoal,
+                 @Param("DemolitionStandardCoal1") String DemolitionStandardCoal1,
+                 @Param("sitePictureOne") String sitePictureOne,
+                 @Param("sitePictureTwo") String sitePictureTwo,
+                 @Param("sitePictureThree") String sitePictureThree,
+                 @Param("templateId") String templateId);
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    List<TemplateData> GetSite(@Param("id") String id);
 
+    void SiteUpdate(@Param("id") String id,
+                    @Param("siteName") String siteName,
+                    @Param("siteAddress") String siteAddress,
+                    @Param("userName") String userName,
+                    @Param("phone") String phone,
+                    @Param("stationAreaId") String stationAreaId,
+                    @Param("routeId") String routeId,
+                    @Param("installedCapacity") String installedCapacity,
+                    @Param("rheologicalChange") String rheologicalChange,
+                    @Param("longitude") String longitude,
+                    @Param("latitude") String latitude,
+                    @Param("region") String region,
+                    @Param("groupingId") String groupingId,
+                    @Param("faultStatus") String faultStatus,
+                    @Param("realTimeLoad") String realTimeLoad,
+                    @Param("totalElectricity") String totalElectricity,
+                    @Param("powerFactor") String powerFactor,
+                    @Param("siteType") String siteType,
+                    @Param("userCompany") String userCompany,
+                    @Param("operationTime") String operationTime,
+                    @Param("serviceDeadline") String serviceDeadline,
+                    @Param("powerSupplyType") String powerSupplyType,
+                    @Param("voltageLevel") String voltageLevel,
+                    @Param("DemolitionStandardCoal") String DemolitionStandardCoal,
+                    @Param("DemolitionStandardCoal1") String DemolitionStandardCoal1,
+                    @Param("sitePictureOne") String sitePictureOne,
+                    @Param("sitePictureTwo") String sitePictureTwo,
+                    @Param("sitePictureThree") String sitePictureThree);
+    void Sitedel(@Param("id") String id);
 }
+

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

@@ -0,0 +1,16 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.SiteType;
+import com.bizmatics.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+public interface SiteTypeService extends CrudService<SiteType> {
+
+}

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

@@ -2,6 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.UserSite;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,10 @@ public interface UserSiteService extends CrudService<UserSite> {
 
 
     Integer count(Integer userId);
+
+    /**
+     *
+     * @param SiteId
+     */
+    void UserSiteAdd(@Param("SiteId") int SiteId);
 }

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

@@ -0,0 +1,20 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.persistence.mapper.DeviceAttributeMapper;
+import com.bizmatics.service.DeviceAttributeService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备属性 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-23
+ */
+@Service
+public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttributeMapper, DeviceAttribute> implements DeviceAttributeService {
+
+}

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

@@ -2,6 +2,8 @@ package com.bizmatics.service.impl;
 
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceList;
+import com.bizmatics.model.TemplateData;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.enums.DeviceStatusCode;
@@ -70,4 +72,10 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                 .filter(device -> Optional.ofNullable(type).map(ds -> ds.equals(device.getDeviceType())).orElse(true))
                 .count();
     }
+
+    public List<DeviceList> DeviceList(String siteId){
+        List<DeviceList> DeviceList = null;
+        DeviceList = baseMapper.DeviceList(Integer.parseInt(siteId));
+        return DeviceList;
+    }
 }

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

@@ -0,0 +1,58 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.SiteDynamicProperties;
+import com.bizmatics.model.UserSite;
+import com.bizmatics.persistence.mapper.SiteDynamicPropertiesMapper;
+import com.bizmatics.service.SiteDynamicPropertiesService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SessionLocal;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * <p>
+ * 站点动态属性表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+@Service
+public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDynamicPropertiesMapper, SiteDynamicProperties> implements SiteDynamicPropertiesService {
+    public void SiteDynamicPropertiesAdd(String fault_status, String real_time_load, String total_electricity, String power_factor, int site_id, String site_type,
+                                         String user_company, String operation_time, String service_deadline, String power_supply_type, String voltage_level,
+                                         String Demolition_standard_coal, String Demolition_standard_coal1,String sitePictureOne,String sitePictureTwo,String sitePictureThree){
+        DateTimeFormatter fmts = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        SiteDynamicProperties site_dynamic_properties = new SiteDynamicProperties();
+        site_dynamic_properties.setFaultStatus(fault_status);
+        site_dynamic_properties.setRealTimeLoad(real_time_load);
+        site_dynamic_properties.setTotalElectricity(total_electricity);
+        site_dynamic_properties.setPowerFactor(power_factor);
+        site_dynamic_properties.setSiteId(site_id);
+        site_dynamic_properties.setSiteType(Integer.parseInt(site_type));
+        site_dynamic_properties.setUserCompany(user_company);
+        site_dynamic_properties.setOperationTime(LocalDate.parse(operation_time, fmts));
+        site_dynamic_properties.setServiceDeadline(LocalDate.parse(service_deadline, fmts));
+        site_dynamic_properties.setPowerSupplyType(Integer.parseInt(power_supply_type));
+        site_dynamic_properties.setVoltageLevel(voltage_level);
+        site_dynamic_properties.setDemolitionStandardCoal(Integer.parseInt(Demolition_standard_coal));
+        site_dynamic_properties.setDemolitionStandardCoal1(Demolition_standard_coal1);
+        site_dynamic_properties.setCreator(SessionLocal.getUser().getUserName());
+        site_dynamic_properties.setCreateTime(LocalDateTime.now());
+        site_dynamic_properties.setSitePictureOne(sitePictureOne);
+        site_dynamic_properties.setSitePictureTwo(sitePictureTwo);
+        site_dynamic_properties.setSitePictureThree(sitePictureThree);
+        this.save(site_dynamic_properties);
+    }
+
+
+    public void SiteDynamicPropertiesUpdate(SiteDynamicProperties siteDynamicProperties){
+        this.updateById(siteDynamicProperties);
+    }
+}

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

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

@@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.model.AlarmPower;
-import com.bizmatics.model.Device;
-import com.bizmatics.model.Site;
+import com.bizmatics.model.*;
 import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.SiteMapper;
 import com.bizmatics.service.DeviceService;
+import com.bizmatics.service.SiteDynamicPropertiesService;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.UserSiteService;
 import com.bizmatics.service.enums.DeviceStatusCode;
@@ -20,12 +19,13 @@ import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -49,6 +49,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     private AlarmPowerMapper alarmPowerMapper;
     @Autowired
     private UserSiteService userSiteService;
+    @Autowired
+    private SiteDynamicPropertiesService siteDynamicPropertiesService;
 
     @Override
     public DeviceCountVO selectCount() {
@@ -66,6 +68,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     public List<Site> list(String name) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         return baseMapper.list(userId, name);
+        return baseMapper.list(SessionLocal.getUserId(), name);
 
     }
 
@@ -98,7 +101,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
 
-    public SiteVO enhanceSite(List<Device> list, Site site, List<AlarmPower> alarmPowers) {
+    public SiteVO enhanceSite(List<Device> list,Site site,List<AlarmPower> alarmPowers){
         SiteVO siteVo = BeanMapperUtils.map(site, SiteVO.class);
         siteVo.setDeviceCount(list.size());
         long deviceCount = list.stream()
@@ -118,13 +121,13 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         } else {
             siteVo.setAlarmPowerCount(0);
         }
-        if (deviceCount > 0) {
+        if (deviceCount > 0){
             siteVo.setStatus(DeviceStatusCode.FAULT.getDescribe());
         } else if (offCount > 0) {
             siteVo.setStatus(DeviceStatusCode.OFFLINE.getDescribe());
         } else if (faultCount > 0) {
             siteVo.setStatus(DeviceStatusCode.FAULT.getDescribe());
-        } else {
+        }else {
             siteVo.setStatus(DeviceStatusCode.NORMAL.getDescribe());
         }
         List<String> deviceTypes = list.stream()
@@ -133,4 +136,191 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         siteVo.setDeviceType(deviceTypes);
         return siteVo;
     }
+    public void SiteAdd(String site_name,String site_address,String user_name,String phone,
+                        String station_area_id,String route_id,String installed_capacity,String rheological_change,String longitude,
+                        String latitude,String region,String grouping_id,String fault_status, String real_time_load,
+                        String total_electricity, String power_factor,  String site_type, String user_company,
+                        String operation_time, String service_deadline, String power_supply_type, String voltage_level,
+                        String Demolition_standard_coal, String Demolition_standard_coal1,String sitePictureOne,
+                        String sitePictureTwo,String sitePictureThree,String templateId){
+
+        if (templateId.equals("")){
+            Site site=new Site();
+            site.setSiteName(site_name);
+            site.setSiteAddress(site_address);
+            site.setCompanyCode(11111);
+            site.setUserName(user_name);
+            site.setPhone(phone);
+            site.setStationAreaId(Integer.parseInt(station_area_id));
+            site.setRouteId(Integer.parseInt(route_id));
+            site.setInstalledCapacity(installed_capacity);
+            site.setRheologicalChange(rheological_change);
+            site.setLongitude(longitude);
+            site.setLatitude(latitude);
+            site.setRegion(Integer.parseInt(region));
+            site.setCreateTime(new Date());
+            site.setCreator(SessionLocal.getUser().getUserName());
+            site.setEnable(1);
+            site.setGroupingId(Integer.parseInt(grouping_id));
+            this.save(site);
+            int ID = site.getId();
+            siteDynamicPropertiesService.SiteDynamicPropertiesAdd(fault_status,real_time_load,total_electricity,power_factor,
+                    ID,site_type, user_company, operation_time, service_deadline, power_supply_type, voltage_level,
+                    Demolition_standard_coal, Demolition_standard_coal1,sitePictureOne,sitePictureTwo,sitePictureThree);
+            userSiteService.UserSiteAdd(ID);
+        }else {
+            List<TemplateData> TemplateDataList = null;
+            TemplateDataList = baseMapper.templateQuery(Integer.parseInt(templateId));
+            TemplateData TemplateDataListOne = (TemplateData) TemplateDataList.get(0);
+            Site site=new Site();
+            site.setSiteName(site_name);
+            site.setSiteAddress(TemplateDataListOne.getSiteAddress());
+            site.setCompanyCode(11111);
+            site.setUserName(TemplateDataListOne.getUserName());
+            site.setPhone(TemplateDataListOne.getPhone());
+            site.setStationAreaId(TemplateDataListOne.getStationAreaId());
+            site.setRouteId(TemplateDataListOne.getRouteId());
+            site.setInstalledCapacity(TemplateDataListOne.getInstalledCapacity());
+            site.setRheologicalChange(TemplateDataListOne.getRheologicalChange());
+            site.setLongitude(TemplateDataListOne.getLongitude());
+            site.setLatitude(TemplateDataListOne.getLatitude());
+            site.setRegion(TemplateDataListOne.getRegion());
+            site.setCreateTime(new Date());
+            site.setCreator(SessionLocal.getUser().getUserName());
+            site.setEnable(1);
+//            site.setGroupingId(TemplateDataListOne.getGroupingId());
+            this.save(site);
+            int ID = site.getId();
+            DateTimeFormatter fmt12 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            siteDynamicPropertiesService.SiteDynamicPropertiesAdd(TemplateDataListOne.getFaultStatus(),TemplateDataListOne.getRealTimeLoad()
+                    ,TemplateDataListOne.getTotalElectricity(),TemplateDataListOne.getPowerFactor(),
+                    ID,Integer.toString(TemplateDataListOne.getSiteType()), TemplateDataListOne.getUserCompany(),
+                    TemplateDataListOne.getOperationTime().format(fmt12), TemplateDataListOne.getServiceDeadline().format(fmt12),
+                    Integer.toString(TemplateDataListOne.getPowerSupplyType()),TemplateDataListOne.getVoltageLevel(),
+                    Integer.toString(TemplateDataListOne.getDemolitionStandardCoal()),TemplateDataListOne.getDemolitionStandardCoal1()
+                    ,TemplateDataListOne.getSitePictureOne(),TemplateDataListOne.getSitePictureTwo(),TemplateDataListOne.getSitePictureThree());
+            userSiteService.UserSiteAdd(ID);
+        }
+    }
+
+
+
+    public List<TemplateData> GetSite(String id){
+        List<TemplateData> TemplateDataList = null;
+        TemplateDataList = baseMapper.templateQuery(Integer.parseInt(id));
+//        TemplateData TemplateDataListOne = (TemplateData) TemplateDataList.get(0);
+        return TemplateDataList;
+    }
+
+
+    public void SiteUpdate(String id,String site_name,String site_address,String user_name,String phone,
+                           String station_area_id,String route_id,String installed_capacity,String rheological_change,String longitude,
+                           String latitude,String region,String grouping_id,String fault_status, String real_time_load,
+                           String total_electricity, String power_factor,  String site_type, String user_company,
+                           String operation_time, String service_deadline, String power_supply_type, String voltage_level,
+                           String Demolition_standard_coal, String Demolition_standard_coal1,String sitePictureOne,
+                           String sitePictureTwo,String sitePictureThree){
+//        Site site=new Site();
+        List<Site> SiteList = null;
+        SiteList = baseMapper.list1(Integer.parseInt(id));
+        Site SiteList1 = (Site) SiteList.get(0);
+        SiteList1.setId(Integer.parseInt(id));
+        if (!site_name.equals("")&&!site_name.equals("null")){
+            SiteList1.setSiteName(site_name);
+        }
+        if (!site_address.equals("")&&!site_address.equals("null")){
+            SiteList1.setSiteAddress(site_address);
+        }
+        if (!user_name.equals("")&&!user_name.equals("null")){
+            SiteList1.setUserName(user_name);
+        }
+        if (!phone.equals("")&&!phone.equals("null")){
+            SiteList1.setPhone(phone);
+        }
+        if (!station_area_id.equals("")&&!station_area_id.equals("0")&&!station_area_id.equals("null")){
+            SiteList1.setStationAreaId(Integer.parseInt(station_area_id));
+        }
+        if (!route_id.equals("")&&!route_id.equals("0")&&!route_id.equals("null")){
+            SiteList1.setRouteId(Integer.parseInt(route_id));
+        }
+        if (!installed_capacity.equals("")&&!installed_capacity.equals("null")){
+            SiteList1.setInstalledCapacity(installed_capacity);
+        }
+        if (!rheological_change.equals("")&&!rheological_change.equals("null")){
+            SiteList1.setRheologicalChange(rheological_change);
+        }
+        if (!longitude.equals("")&&!longitude.equals("null")){
+            SiteList1.setLongitude(longitude);
+        }
+        if (!latitude.equals("")&&!latitude.equals("null")){
+            SiteList1.setLatitude(latitude);
+        }
+        if (!region.equals("")&&!region.equals("0")&&!region.equals("null")){
+            SiteList1.setRegion(Integer.parseInt(region));
+        }
+//        if (!grouping_id.equals("")&&!grouping_id.equals("0")){
+//            site.setGroupingId(Integer.parseInt(grouping_id));
+//        }
+        List<SiteDynamicProperties> SiteDynamicPropertiesList = null;
+        SiteDynamicPropertiesList = baseMapper.SiteDynamicPropertieslist(Integer.parseInt(id));
+        SiteDynamicProperties SiteDynamicPropertiesList1 = (SiteDynamicProperties) SiteDynamicPropertiesList.get(0);
+
+        if (!fault_status.equals("")&&!fault_status.equals("null")){
+            SiteDynamicPropertiesList1.setFaultStatus(fault_status);
+        }
+        if (!real_time_load.equals("")&&!real_time_load.equals("null")){
+            SiteDynamicPropertiesList1.setRealTimeLoad(real_time_load);
+        }
+        if (!total_electricity.equals("")&&!total_electricity.equals("null")){
+            SiteDynamicPropertiesList1.setTotalElectricity(total_electricity);
+        }
+        if (!power_factor.equals("")&&!power_factor.equals("null")){
+            SiteDynamicPropertiesList1.setPowerFactor(power_factor);
+        }
+        if (!site_type.equals("")&&!site_type.equals("0")&&!site_type.equals("null")){
+            SiteDynamicPropertiesList1.setSiteType(Integer.parseInt(site_type));
+        }
+        if (!user_company.equals("")&&!user_company.equals("null")){
+            SiteDynamicPropertiesList1.setUserCompany(user_company);
+        }
+        if (!operation_time.equals("")&&!operation_time.equals("null")){
+            SiteDynamicPropertiesList1.setOperationTime(LocalDate.parse(operation_time));
+        }
+        if (!service_deadline.equals("")&&!service_deadline.equals("null")){
+            SiteDynamicPropertiesList1.setServiceDeadline(LocalDate.parse(service_deadline));
+        }
+        if (!power_supply_type.equals("")&&!power_supply_type.equals("0")&&!power_supply_type.equals("null")){
+            SiteDynamicPropertiesList1.setPowerSupplyType(Integer.parseInt(power_supply_type));
+        }
+        if (!voltage_level.equals("")&&!voltage_level.equals("null")){
+            SiteDynamicPropertiesList1.setVoltageLevel(voltage_level);
+        }
+        if (!Demolition_standard_coal.equals("")&&!Demolition_standard_coal.equals("0")&&!Demolition_standard_coal.equals("null")){
+            SiteDynamicPropertiesList1.setDemolitionStandardCoal(Integer.parseInt(Demolition_standard_coal));
+        }
+        if (!Demolition_standard_coal1.equals("")&&!Demolition_standard_coal1.equals("null")){
+            SiteDynamicPropertiesList1.setDemolitionStandardCoal1(Demolition_standard_coal1);
+        }
+        if (!sitePictureOne.equals("")&&!sitePictureOne.equals("null")){
+            SiteDynamicPropertiesList1.setSitePictureOne(sitePictureOne);
+        }
+        if (!sitePictureTwo.equals("")&&!sitePictureTwo.equals("null")){
+            SiteDynamicPropertiesList1.setSitePictureTwo(sitePictureTwo);
+        }
+        if (!sitePictureThree.equals("")&&!sitePictureThree.equals("null")){
+            SiteDynamicPropertiesList1.setSitePictureThree(sitePictureThree);
+        }
+
+        this.updateById(SiteList1);
+        siteDynamicPropertiesService.SiteDynamicPropertiesUpdate(SiteDynamicPropertiesList1);
+    }
+
+    public void Sitedel(String id){
+        List<Site> SiteList = null;
+        SiteList = baseMapper.list1(Integer.parseInt(id));
+        Site SiteList1 = (Site) SiteList.get(0);
+        SiteList1.setId(Integer.parseInt(id));
+        SiteList1.setEnable(0);
+        this.updateById(SiteList1);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.SiteType;
+import com.bizmatics.persistence.mapper.SiteTypeMapper;
+import com.bizmatics.service.SiteTypeService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-22
+ */
+@Service
+public class SiteTypeServiceImpl extends AbstractCrudService<SiteTypeMapper, SiteType> implements SiteTypeService {
+
+}

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

@@ -6,6 +6,7 @@ import com.bizmatics.model.UserSite;
 import com.bizmatics.persistence.mapper.UserSiteMapper;
 import com.bizmatics.service.UserSiteService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SessionLocal;
 import org.springframework.stereotype.Service;
 
 /**
@@ -25,4 +26,12 @@ public class UserSiteServiceImpl extends AbstractCrudService<UserSiteMapper, Use
         queryWrapper.eq(UserSite::getUserId,userId);
         return this.count(queryWrapper);
     }
+
+    public void UserSiteAdd(int SiteId){
+        Integer user_id = SessionLocal.getUserId();
+        UserSite usersite = new UserSite();
+        usersite.setSiteId(SiteId);
+        usersite.setUserId(user_id);
+        this.save(usersite);
+    }
 }