站点管理-基本信息-相关接口优化

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

@@ -8,12 +8,9 @@ import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
+import com.bizmatics.service.vo.SiteVOT;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -89,84 +86,16 @@ public class SiteController {
 
     /**
      *
-     * @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
+     * @param siteVOT
      * @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);
+    public ApiResult<Void> siteAdd(@RequestBody SiteVOT siteVOT) {
+        if (siteVOT.getId()==0){
+            siteService.siteAdd(siteVOT);
         }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);
+            siteService.siteUpdate(siteVOT);
         }
-
         return ApiResult.success();
     }
 

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

@@ -187,4 +187,9 @@ public class TemplateData implements Serializable {
      * 流变变化
      */
     private String rheologicalChange;
+
+    /**
+     * id
+     */
+    private Integer siteDynamicPropertiesId;
 }

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

@@ -152,6 +152,7 @@
         a.latitude,
         a.region,
         a.grouping_id,
+        b.id as site_dynamic_properties_id,
         b.fault_status,
         b.real_time_load,
         b.total_electricity,

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

@@ -14,40 +14,10 @@ import org.apache.ibatis.annotations.Param;
  */
 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);
+    void siteDynamicPropertiesAdd(@Param("siteDynamicProperties") SiteDynamicProperties siteDynamicProperties);
+
+    void SiteDynamicPropertiesUpdate(@Param("siteDynamicProperties") SiteDynamicProperties siteDynamicProperties);
 }
 
 

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

@@ -7,6 +7,7 @@ import com.bizmatics.model.SiteList;
 import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
+import com.bizmatics.service.vo.SiteVOT;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -62,61 +63,8 @@ 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);
+
+    void siteAdd(@Param("siteVOT") SiteVOT siteVOT);
 
     /**
      *
@@ -125,34 +73,7 @@ public interface SiteService extends CrudService<Site> {
      */
     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 siteUpdate(@Param("id") SiteVOT siteVOT);
     void sitedel(@Param("id") String id);
 }
 

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

@@ -23,31 +23,8 @@ import java.time.format.DateTimeFormatter;
 @Service
 public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDynamicPropertiesMapper, SiteDynamicProperties> implements SiteDynamicPropertiesService {
     @Override
-    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);
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        site_dynamic_properties.setCreator(user.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 siteDynamicPropertiesAdd(SiteDynamicProperties siteDynamicProperties){
+        this.save(siteDynamicProperties);
     }
 
     @Override

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

@@ -19,11 +19,13 @@ import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
+import com.bizmatics.service.vo.SiteVOT;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -104,7 +106,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()
@@ -124,13 +126,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()
@@ -139,78 +141,28 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         siteVo.setDeviceType(deviceTypes);
         return siteVo;
     }
-    @Override
-    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){
 
+    @Override
+    public void siteAdd(SiteVOT siteVOT) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        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(user.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(user.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);
-        }
+        Site site1 = siteVOT.getSite();
+        site1.setCreateTime(new Date());
+        site1.setCreator(user.getUserName());
+        site1.setCompanyCode(11111);
+        site1.setEnable(1);
+        this.save(site1);
+        int ID = site1.getId();
+        SiteDynamicProperties siteDynamicProperties = siteVOT.getSiteDynamicProperties();
+        siteDynamicProperties.setSiteId(ID);
+        siteDynamicProperties.setCreator(user.getUserName());
+        siteDynamicProperties.setCreateTime(LocalDateTime.now());
+        siteDynamicPropertiesService.siteDynamicPropertiesAdd(siteDynamicProperties);
+        userSiteService.UserSiteAdd(ID);
     }
 
 
     @Override
-    public List<TemplateData> getSite(String id){
+    public List<TemplateData> getSite(String id) {
         List<TemplateData> TemplateDataList = null;
         TemplateDataList = baseMapper.templateQuery(Integer.parseInt(id));
 //        TemplateData TemplateDataListOne = (TemplateData) TemplateDataList.get(0);
@@ -218,109 +170,13 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
     @Override
-    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 siteUpdate(SiteVOT siteVOT) {
+        this.updateById(siteVOT.getSite());
+        siteDynamicPropertiesService.updateById(siteVOT.getSiteDynamicProperties());
     }
+
     @Override
-    public void sitedel(String id){
+    public void sitedel(String id) {
         List<Site> SiteList = null;
         SiteList = baseMapper.list1(Integer.parseInt(id));
         Site SiteList1 = (Site) SiteList.get(0);

fiveep-service/src/main/java/com/bizmatics/service/vo/SiteVOT.java

@@ -0,0 +1,18 @@
+package com.bizmatics.service.vo;
+
+import com.bizmatics.model.Site;
+import com.bizmatics.model.SiteDynamicProperties;
+import com.bizmatics.model.UserSite;
+import lombok.Data;
+
+@Data
+public class SiteVOT {
+
+    private Site site;
+
+    private SiteDynamicProperties siteDynamicProperties;
+
+    private UserSite userSite;
+
+    private Integer id;
+}