站点管理基础信息新增

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

@@ -33,48 +33,95 @@ 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){
+    public ApiResult<List<Map<String, Object>>> Sitelist(@RequestParam(required = false) String name) {
         return ApiResult.success(siteService.Sitelist(name));
     }
+
+
+    @GetMapping("SiteAdd")
+    public ApiResult<Void> SiteAdd(@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) {
+        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);
+        return ApiResult.success();
+    }
 }
 

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

@@ -99,14 +99,35 @@ public class SiteDynamicProperties implements Serializable {
     /**
      * 拆标准煤:1\电力（等价）、2\电力（当量）
      */
-    @TableField("Demolition_standard_coal")
+    @TableField("demolition_standard_coal")
     private Integer demolitionStandardCoal;
 
     /**
      * 拆标准煤
      */
-    @TableField("Demolition_standard_coal1")
+    @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/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/SiteMapper.java

@@ -1,10 +1,7 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.Device;
-import com.bizmatics.model.GroupingList;
-import com.bizmatics.model.Site;
+import com.bizmatics.model.*;
 import com.bizmatics.common.mvc.base.CrudMapper;
-import com.bizmatics.model.SiteList;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -43,5 +40,7 @@ public interface SiteMapper extends CrudMapper<Site> {
     List<SiteList> SiteGroupinglist(@Param("userId") Integer userId,
                                     @Param("name") String name);
 
+    List<TemplateData> templateQuery(@Param("id") Integer id);
+
 
 }

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

@@ -135,6 +135,48 @@
             </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>
+            <if test="id != null and id != 0">
+                and a.id = #{id}
+            </if>
+        </where>
+    </select>
+
 
 
 </mapper>

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

@@ -2,6 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.SiteDynamicProperties;
 import com.bizmatics.common.mvc.base.CrudService;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,36 @@ import com.bizmatics.common.mvc.base.CrudService;
  */
 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);
 }

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

@@ -60,11 +60,35 @@ 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("companyCode") String companyCode,
                  @Param("userName") String userName,
                  @Param("phone") String phone,
                  @Param("stationAreaId") String stationAreaId,
@@ -74,7 +98,23 @@ public interface SiteService extends CrudService<Site> {
                  @Param("longitude") String longitude,
                  @Param("latitude") String latitude,
                  @Param("region") String region,
-                 @Param("groupingId") String groupingId);
+                 @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);
 
     /**
      *

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

@@ -1,11 +1,20 @@
 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>
  * 站点动态属性表 服务实现类
@@ -16,5 +25,29 @@ import org.springframework.stereotype.Service;
  */
 @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);
+    }
 }

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

@@ -11,6 +11,7 @@ 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;
@@ -21,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,6 +47,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     private AlarmPowerMapper alarmPowerMapper;
     @Autowired
     private UserSiteService userSiteService;
+    @Autowired
+    private SiteDynamicPropertiesService siteDynamicPropertiesService;
 
     @Override
     public DeviceCountVO selectCount() {
@@ -181,32 +185,74 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         siteVo.setDeviceType(deviceTypes);
         return siteVo;
     }
-    public void SiteAdd(String site_name,String site_address,String company_code,String user_name,String phone,
+    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){
-        Site site=new Site();
-        site.setSiteName(site_name);
-        site.setSiteAddress(site_address);
-        site.setCompanyCode(Integer.parseInt(company_code));
-        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();
-
-
-        this.save(site);
-        userSiteService.UserSiteAdd(ID);
+                        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(TemplateDataListOne.getSiteName());
+            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);
+
+
+        }
     }