测试

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

@@ -81,7 +81,7 @@ public class DeviceController {
 
     @GetMapping("DeviceList")
     public ApiResult<List<DeviceList>> DeviceList(@RequestParam String siteId) {
-        return ApiResult.success(deviceService.DeviceList(siteId));
+        return ApiResult.success(deviceService.deviceList(siteId));
     }
 }
 

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

@@ -81,9 +81,9 @@ public class SiteController {
      * @param name 站点名称
      * @return
      */
-    @GetMapping("Sitelist")
-    public ApiResult<List<Map<String, Object>>> Sitelist(@RequestParam(required = false) String name) {
-        return ApiResult.success(siteService.Sitelist(name));
+    @GetMapping("siteList")
+    public ApiResult<List<Map<String, Object>>> siteList(@RequestParam(required = false) String name) {
+        return ApiResult.success(siteService.siteList(name));
     }
 
 
@@ -120,8 +120,8 @@ public class SiteController {
      * @param templateId
      * @return
      */
-    @GetMapping("SiteAdd")
-    public ApiResult<Void> SiteAdd(@RequestParam(required = false) String id,
+    @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,
@@ -151,14 +151,14 @@ public class SiteController {
                                    @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,
+            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,
+            siteService.siteUpdate(id, siteName, siteAddress, userName, phone,
                      stationAreaId, routeId, installedCapacity, rheologicalChange, longitude,
                      latitude, region, groupingId, faultStatus,  realTimeLoad,
                      totalElectricity,  powerFactor,   siteType,  userCompany,
@@ -170,9 +170,9 @@ public class SiteController {
         return ApiResult.success();
     }
 
-    @GetMapping("SiteDel")
-    public ApiResult<Void> SiteDel(@RequestParam(required = false) String id) {
-            siteService.Sitedel(id);
+    @GetMapping("siteDel")
+    public ApiResult<Void> siteDel(@RequestParam(required = false) String id) {
+            siteService.sitedel(id);
         return ApiResult.success();
     }
 
@@ -181,11 +181,9 @@ public class SiteController {
      * @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("getSite")
+    public ApiResult<List<TemplateData>> getSite(@RequestParam String id) {
+        return ApiResult.success(siteService.getSite(id));
     }
 
 

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

@@ -29,15 +29,16 @@ public class SiteGroupingController {
      * @param groupingName 站点分组名称
      * @return
      */
-    @RequestMapping("SiteGroupingAdd")
-    public ApiResult<Void> SiteGroupingAdd(@RequestParam String groupingName){
-        siteGroupingService.SiteGroupingAdd(groupingName);
+    @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);
+    @RequestMapping("siteGroupingUpdate")
+    public ApiResult<Void> siteGroupingUpdate(@RequestParam String groupingName,
+                                              @RequestParam int id){
+        siteGroupingService.siteGroupingUpdate(groupingName,id);
         return ApiResult.success();
     }
 }

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

@@ -33,5 +33,5 @@ public interface DeviceService extends CrudService<Device> {
      */
     DeviceCountVO selectDeviceCountByType(Integer site);
 
-    List<DeviceList> DeviceList(String siteId);
+    List<DeviceList> deviceList(String siteId);
 }

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

@@ -20,14 +20,14 @@ public interface SiteGroupingService extends CrudService<SiteGrouping> {
      *
      * @param groupingName
      */
-    void SiteGroupingAdd(@Param("groupingName") String groupingName);
+    void siteGroupingAdd(@Param("groupingName") String groupingName);
 
     /**
      *
      * @param groupingName
      * @param id
      */
-    void SiteGroupingUpdate(@Param("groupingName") String groupingName,
+    void siteGroupingUpdate(@Param("groupingName") String groupingName,
                             @Param("id") int id);
 
 }

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

@@ -42,7 +42,7 @@ public interface SiteService extends CrudService<Site> {
      * @param name
      * @return
      */
-    List<Map<String, Object>> Sitelist(String name);
+    List<Map<String, Object>> siteList(String name);
 
 
     /**
@@ -89,7 +89,7 @@ public interface SiteService extends CrudService<Site> {
      * @param DemolitionStandardCoal
      * @param DemolitionStandardCoal1
      */
-    void SiteAdd(@Param("siteName") String siteName,
+    void siteAdd(@Param("siteName") String siteName,
                  @Param("siteAddress") String siteAddress,
                  @Param("userName") String userName,
                  @Param("phone") String phone,
@@ -123,9 +123,9 @@ public interface SiteService extends CrudService<Site> {
      * @param id
      * @return
      */
-    List<TemplateData> GetSite(@Param("id") String id);
+    List<TemplateData> getSite(@Param("id") String id);
 
-    void SiteUpdate(@Param("id") String id,
+    void siteUpdate(@Param("id") String id,
                     @Param("siteName") String siteName,
                     @Param("siteAddress") String siteAddress,
                     @Param("userName") String userName,
@@ -153,6 +153,6 @@ public interface SiteService extends CrudService<Site> {
                     @Param("sitePictureOne") String sitePictureOne,
                     @Param("sitePictureTwo") String sitePictureTwo,
                     @Param("sitePictureThree") String sitePictureThree);
-    void Sitedel(@Param("id") String id);
+    void sitedel(@Param("id") String id);
 }
 

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

@@ -73,7 +73,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                 .count();
     }
 
-    public List<DeviceList> DeviceList(String siteId){
+    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/SiteGroupingServiceImpl.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 public class SiteGroupingServiceImpl extends AbstractCrudService<SiteGroupingMapper, SiteGrouping> implements SiteGroupingService {
 
     @Override
-    public void SiteGroupingAdd(String groupingName){
+    public void siteGroupingAdd(String groupingName){
         SysUser user = SecurityUtils.getLoginUser().getUser();
         SiteGrouping siteGrouping = new SiteGrouping();
         siteGrouping.setGroupingName(groupingName);
@@ -32,7 +32,7 @@ public class SiteGroupingServiceImpl extends AbstractCrudService<SiteGroupingMap
     }
 
     @Override
-    public void SiteGroupingUpdate(String groupingName,int id){
+    public void siteGroupingUpdate(String groupingName,int id){
         SiteGrouping siteGrouping = new SiteGrouping();
         siteGrouping.setGroupingName(groupingName);
         siteGrouping.setId(id);

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

@@ -71,7 +71,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
     @Override
-    public List<Map<String, Object>> Sitelist(String name) {
+    public List<Map<String, Object>> siteList(String name) {
         return null;
     }
 
@@ -140,7 +140,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         return siteVo;
     }
     @Override
-    public void SiteAdd(String site_name,String site_address,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,String fault_status, String real_time_load,
                         String total_electricity, String power_factor,  String site_type, String user_company,
@@ -210,7 +210,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
 
 
     @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,7 +218,7 @@ 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,
+    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,
@@ -320,7 +320,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         siteDynamicPropertiesService.SiteDynamicPropertiesUpdate(SiteDynamicPropertiesList1);
     }
     @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);