Merge remote-tracking branch 'origin/master'

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentPointController.java

@@ -32,7 +32,7 @@ public class ProBasicEquipmentPointController {
      * 查询
      *
      * @param id
-     * @param code
+     * @param nemCode
      * @param name
      * @param model
      * @param uniformCode
@@ -43,14 +43,14 @@ public class ProBasicEquipmentPointController {
     @GetMapping(value = "/list")
     @ApiOperation(value = "设备测点-列表", notes = "设备测点-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
-                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
                       @RequestParam(value = "model", required = false) String model,
                       @RequestParam(value = "uniformCode", required = false) String uniformCode,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicEquipmentPoint> list = proBasicEquipmentPointService.list(id, code, name,aname, model, uniformCode, pageNum, pageSize);
+        IPage<ProBasicEquipmentPoint> list = proBasicEquipmentPointService.list(id, nemCode, name,aname, model, uniformCode, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicPowerstationPointController.java

@@ -45,13 +45,13 @@ public class ProBasicPowerstationPointController {
     @GetMapping(value = "/list")
     @ApiOperation(value = "场站测点-列表", notes = "场站测点-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
-                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "model", required = false) String model,
                       @RequestParam(value = "uniformCode", required = false) String uniformCode,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicPowerstationPoint> list = proBasicWppointService.list(id, code, name, model, uniformCode, pageNum, pageSize);
+        IPage<ProBasicPowerstationPoint> list = proBasicWppointService.list(id, nemCode, name, model, uniformCode, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicSubStationController.java

@@ -37,12 +37,12 @@ public class ProBasicSubStationController {
     @GetMapping(value = "/List")
     @ApiOperation(value = "变电所-列表", notes = "变电所-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
-                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "stationId", required = false) String stationId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicSubStation> list = proBasicWindsubStationService.list(id, name,stationId, code, pageNum, pageSize);
+        IPage<ProBasicSubStation> list = proBasicWindsubStationService.list(id, name,stationId, nemCode, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWeatherStationController.java

@@ -34,12 +34,12 @@ public class ProBasicWeatherStationController {
     @GetMapping(value = "/List")
     @ApiOperation(value = "气象站-列表", notes = "气象站-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
-                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "stationId", required = false) String stationId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicWeatherStation> list = proBasicWeatherStationService.list(id, name,stationId, code, pageNum, pageSize);
+        IPage<ProBasicWeatherStation> list = proBasicWeatherStationService.list(id, name,stationId, nemCode, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicPowerstationPointService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicPowerstationPointService extends IService<ProBasicPowerstationPoint> {
-    IPage<ProBasicPowerstationPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize);
+    IPage<ProBasicPowerstationPoint> list(String id, String nemCode, String name, String model, String uniformCode, String pageNum, String pageSize);
 
     boolean addOrUpdate(ProBasicPowerstationPoint pointnew);
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicSubStationService.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicSubStationService extends IService<ProBasicSubStation> {
-    IPage<ProBasicSubStation> list(String id, String name,String stationId, String code, String pageNum, String pageSize);
+    IPage<ProBasicSubStation> list(String id, String name,String stationId, String nemCode, String pageNum, String pageSize);
 
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicWeatherStationService.java

@@ -14,6 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProBasicWeatherStationService extends IService<ProBasicWeatherStation> {
 
-    IPage<ProBasicWeatherStation> list(String id, String name, String stationId, String code, String pageNum, String pageSize);
+    IPage<ProBasicWeatherStation> list(String id, String name, String stationId, String nemCode, String pageNum, String pageSize);
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicCompanyServiceImpl.java

@@ -31,10 +31,10 @@ public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMappe
             qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(groupId)) {
-            qw.eq("groupId", groupId);
+            qw.eq("group_id", groupId);
         }
         if (StringUtils.isNotEmpty(regionId)) {
-            qw.eq("regionId", regionId);
+            qw.eq("region_id", regionId);
         }
 
         if (StringUtils.isNotEmpty(name)) {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicEquipmentPointServiceImpl.java

@@ -28,13 +28,13 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
     ProBasicEquipmentPointMapper proBasicEquipmentPointMapper;
 
     @Override
-    public IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String aname, String model, String uniformCode, String pageNum, String pageSize) {
+    public IPage<ProBasicEquipmentPoint> list(String id, String nemCode, String name, String aname, String model, String uniformCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
             qw.eq("id", id);
         }
-        if (StringUtils.isNotEmpty(code)) {
-            qw.like("code", code);
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.like("nem_code", nemCode);
         }
 
         if (StringUtils.isNotEmpty(name)) {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicEquipmentServiceImpl.java

@@ -30,13 +30,13 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
             qw.eq("id",id);
         }
         if (StringUtils.isNotEmpty(nemCode)){
-            qw.like("nemCode",nemCode);
+            qw.like("nem_code",nemCode);
         }
         if (StringUtils.isNotEmpty(companyId)) {
-            qw.eq("companyId", companyId);
+            qw.eq("company_id", companyId);
         }
         if (StringUtils.isNotEmpty(regionId)) {
-            qw.eq("regionId", regionId);
+            qw.eq("region_id", regionId);
         }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicMeterPointServiceImpl.java

@@ -28,7 +28,7 @@ public class ProBasicMeterPointServiceImpl extends ServiceImpl<ProBasicMeterPoin
             qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(nemCode)) {
-            qw.like("nemCode", nemCode);
+            qw.like("nem_code", nemCode);
         }
         if (StringUtils.isNotEmpty(windpowerstationId)) {
             qw.like("windpowerstation_id", windpowerstationId);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicPowerstationPointServiceImpl.java

@@ -25,13 +25,13 @@ import java.util.List;
 public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPowerstationPointMapper, ProBasicPowerstationPoint> implements IProBasicPowerstationPointService {
 
     @Override
-    public IPage<ProBasicPowerstationPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize) {
+    public IPage<ProBasicPowerstationPoint> list(String id, String nemCode, String name, String model, String uniformCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
             qw.eq("id", id);
         }
-        if (StringUtils.isNotEmpty(code)) {
-            qw.like("code", code);
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.like("nem_code", nemCode);
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);
@@ -40,7 +40,7 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
             qw.like("model",model );
         }
         if (StringUtils.isNotEmpty(uniformCode)) {
-            qw.eq("uniformCode",uniformCode );
+            qw.eq("uniform_code",uniformCode );
         }
 
         Page<ProBasicPowerstationPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicPowerstationServiceImpl.java

@@ -40,7 +40,7 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
         }
 
         if (StringUtils.isNotEmpty(nemCode)){
-            qw.like("nemCode",nemCode);
+            qw.like("nem_code",nemCode);
         }
 
         if (StringUtils.isNotEmpty(name)){

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicRegionServiceImpl.java

@@ -38,7 +38,7 @@ public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper,
             qw.like("aname",aname);
         }
         if (StringUtils.isNotEmpty(nemCode)){
-            qw.like("nemCode",nemCode);
+            qw.like("nem_code",nemCode);
         }
 
         Page<ProBasicRegion> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicSubStationServiceImpl.java

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
 public class ProBasicSubStationServiceImpl extends ServiceImpl<ProBasicSubStationMapper, ProBasicSubStation> implements IProBasicSubStationService {
 
     @Override
-    public IPage<ProBasicSubStation> list(String id, String name, String stationId,String code, String pageNum, String pageSize) {
+    public IPage<ProBasicSubStation> list(String id, String name, String stationId,String nemCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicSubStation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -37,8 +37,8 @@ public class ProBasicSubStationServiceImpl extends ServiceImpl<ProBasicSubStatio
         }
 
 
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+        if (StringUtils.isNotEmpty(nemCode)){
+            qw.like("nem_code",nemCode);
         }
 
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicWeatherStationServiceImpl.java

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Service;
 public class ProBasicWeatherStationServiceImpl extends ServiceImpl<ProBasicWeatherStationMapper, ProBasicWeatherStation> implements IProBasicWeatherStationService {
 
     @Override
-    public IPage<ProBasicWeatherStation> list(String id, String name, String stationId, String code, String pageNum, String pageSize) {
+    public IPage<ProBasicWeatherStation> list(String id, String name, String stationId, String nemCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicWeatherStation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -37,8 +37,8 @@ public class ProBasicWeatherStationServiceImpl extends ServiceImpl<ProBasicWeath
         }
 
 
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+        if (StringUtils.isNotEmpty(nemCode)){
+            qw.like("nem_code",nemCode);
         }