站点管理基础信息新增、修改接口更新

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

@@ -87,8 +87,41 @@ public class SiteController {
     }
 
 
+    /**
+     *
+     * @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 siteName,
+    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,
@@ -116,20 +149,39 @@ public class SiteController {
                                    @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);
+        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();
     }
 
+    /**
+     *
+     * @param id
+     * @return
+     */
     @GetMapping("GetSite")
     public ApiResult<List<TemplateData>> GetSite(@RequestParam String id) {
-//        List<TemplateData> TemplateDataList = siteService.GetSite(id);
+        List<TemplateData> TemplateDataList = siteService.GetSite(id);
+        System.out.println(TemplateDataList);
         return ApiResult.success(siteService.GetSite(id));
     }
+
+
     @GetMapping("test1")
     public String test(){
         return "这是中文";

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

@@ -1,7 +1,11 @@
 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>
@@ -12,5 +16,5 @@ import com.bizmatics.common.mvc.base.CrudMapper;
  * @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

@@ -42,5 +42,7 @@ public interface SiteMapper extends CrudMapper<Site> {
 
     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/resources/mapper/mysql/SiteDynamicPropertiesMapper.xml

@@ -21,5 +21,14 @@
         <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

@@ -136,7 +136,7 @@
         </where>
     </select>
     <select id="templateQuery" resultType="com.bizmatics.model.TemplateData">
-        SELECT
+        select
         a.id,
         a.site_name,
         a.site_address,
@@ -167,16 +167,33 @@
         b.site_picture_one,
         b.site_picture_two,
         b.site_picture_three
-        FROM
+        from
         site AS a
-        LEFT JOIN site_dynamic_properties AS b ON a.id = b.site_id
+        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>
-
+    <select id="list1" resultType="com.bizmatics.model.Site">
+        select *
+        from  site
+        <where>
+            <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-service/src/main/java/com/bizmatics/service/SiteDynamicPropertiesService.java

@@ -46,4 +46,8 @@ public interface SiteDynamicPropertiesService extends CrudService<SiteDynamicPro
                                   @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/SiteService.java

@@ -2,6 +2,7 @@ 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;
@@ -119,7 +120,38 @@ public interface SiteService extends CrudService<Site> {
 
     /**
      *
-     * @param groupingName
+     * @param id
+     * @return
      */
-    List<TemplateData> GetSite(@Param("groupingName") String groupingName);
+    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);
 }
+

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

@@ -50,4 +50,9 @@ public class SiteDynamicPropertiesServiceImpl extends AbstractCrudService<SiteDy
         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/SiteServiceImpl.java

@@ -19,9 +19,11 @@ import com.bizmatics.service.util.SessionLocal;
 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.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -260,4 +262,107 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
 //        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);
+    }
 }